Messages in this thread Patch in this message | | | Date | Tue, 22 Apr 2008 16:17:45 +0100 | From | "Jan Beulich" <> | Subject | [PATCH] i386: move FIX_ACPI_* into non-permanent range |
| |
.. as they are used at early boot time only.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- include/asm-x86/fixmap_32.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
--- linux-2.6.25/include/asm-x86/fixmap_32.h 2008-04-17 04:49:44.000000000 +0200 +++ 2.6.25-i386-fixmap-acpi-non-permanent/include/asm-x86/fixmap_32.h 2008-04-15 10:49:20.000000000 +0200 @@ -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
| |