Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c8ab982 authored by Jan Beulich's avatar Jan Beulich Committed by Thomas Gleixner
Browse files

i386: move FIX_ACPI_* into non-permanent range 



.. as they are used at early boot time only.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4e50e62c

include/asm-x86/fixmap_32.h

+4 −4
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ enum fixed_addresses { 
	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */

	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,

#endif

#ifdef CONFIG_ACPI

	FIX_ACPI_BEGIN,

	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,

#endif

#ifdef CONFIG_PCI_MMCONFIG

	FIX_PCIE_MCFG,

#endif
@@ -103,6 +99,10 @@ enum fixed_addresses { 
			(__end_of_permanent_fixed_addresses & 511),

	FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1,

	FIX_WP_TEST,

#ifdef CONFIG_ACPI

	FIX_ACPI_BEGIN,

	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,

#endif

#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

	FIX_OHCI1394_BASE,

#endif