aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/fixmap_32.h
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2008-05-12 15:43:38 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 08:58:30 +0200
commit4c8ab98249fa3cead320ec0ee4cde9960b951989 (patch)
treefc66388381aec22119c9432e1c2ada1beb1823c0 /include/asm-x86/fixmap_32.h
parent4e50e62ce52f39b5f45e82f68b18254458b429bb (diff)
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> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/fixmap_32.h')
-rw-r--r--include/asm-x86/fixmap_32.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/fixmap_32.h b/include/asm-x86/fixmap_32.h
index 4b96148e90c..f0df7ee9681 100644
--- a/include/asm-x86/fixmap_32.h
+++ b/include/asm-x86/fixmap_32.h
@@ -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