i386: move FIX_ACPI_* into non-permanent range
PATCH 1/1 i386: move FIX_ACPI_* into non-permanent range
.. as they are used at early boot time only.
Signed-off-by Jan Beulich <[email protected]>
--- include/asm-x86/fixmap_32.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/asm-x86/fixmap_32.h +4 -4
@@ -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
@@ -104,6 +100,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