diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-09 20:16:36 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 09:01:25 +0200 |
| commit | f34fa82b19581affffb14f8ad9bdad9b5ab4daf5 (patch) | |
| tree | f8b5568037d71cd9212c49aa96c0f14c239aeecc /include/asm-x86/fixmap_64.h | |
| parent | 7b16eb8930d1e2a7ce5c7f35c87d62252ecc91f2 (diff) | |
| download | blackbird-op-linux-f34fa82b19581affffb14f8ad9bdad9b5ab4daf5.tar.gz blackbird-op-linux-f34fa82b19581affffb14f8ad9bdad9b5ab4daf5.zip | |
x86, acpi: merge __acpi_map_table
and let 64-bit to fall back to use fixmap too.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/fixmap_64.h')
| -rw-r--r-- | include/asm-x86/fixmap_64.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-x86/fixmap_64.h b/include/asm-x86/fixmap_64.h index 1a0b61eb02ff..6a4789d57e6c 100644 --- a/include/asm-x86/fixmap_64.h +++ b/include/asm-x86/fixmap_64.h @@ -12,6 +12,7 @@ #define _ASM_FIXMAP_64_H #include <linux/kernel.h> +#include <asm/acpi.h> #include <asm/apicdef.h> #include <asm/page.h> #include <asm/vsyscall.h> @@ -49,6 +50,10 @@ enum fixed_addresses { #ifdef CONFIG_PARAVIRT FIX_PARAVIRT_BOOTMAP, #endif +#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 |
