summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-08 02:39:38 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-09 15:34:12 +0300
commiteecb9a697f0b790e5840dae8a8b866bea49a86ee (patch)
tree0eb2a43cbde25b93aebab9c24a0acb7b8cf72b90
parent1c14fa4937eb73509e07ac12bf8db1fdf4c42a59 (diff)
downloadlinux-eecb9a697f0b790e5840dae8a8b866bea49a86ee.tar.xz
x86: always explicitly map acpi memory
Always map acpi tables, rather than assuming we can use the normal linear mapping to access the acpi tables. This is necessary in a virtual environment where the linear mappings are to pseudo-physical memory, but the acpi tables exist at a real physical address. It doesn't hurt to map in the normal non-virtual case, so just do it unconditionally. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Len Brown <len.brown@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/acpi/boot.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index c518599e4264..5424a18f2e4e 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -127,9 +127,6 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
if (!phys || !size)
return NULL;
- if (phys+size <= (max_low_pfn_mapped << PAGE_SHIFT))
- return __va(phys);
-
if (prev_map)
early_iounmap(prev_map, prev_size);