diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-10 20:38:26 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 10:24:04 +0200 |
| commit | f361a450bf1ad14e2b003217dbf3958638631265 (patch) | |
| tree | 10c1e4dcc0047f6c37387cada6a0bceba088d2d2 /arch/x86/kernel/acpi/boot.c | |
| parent | f302a5bbe5eb95f3d4227d5bd0e9b92b1b125f4f (diff) | |
| download | blackbird-op-linux-f361a450bf1ad14e2b003217dbf3958638631265.tar.gz blackbird-op-linux-f361a450bf1ad14e2b003217dbf3958638631265.zip | |
x86: introduce max_low_pfn_mapped for 64-bit
when more than 4g memory is installed, don't map the big hole below 4g.
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 'arch/x86/kernel/acpi/boot.c')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index a31a579a47ca..9c981c4a3644 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -130,7 +130,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) if (!phys || !size) return NULL; - if (phys+size <= (max_pfn_mapped << PAGE_SHIFT)) + if (phys+size <= (max_low_pfn_mapped << PAGE_SHIFT)) return __va(phys); offset = phys & (PAGE_SIZE - 1); |
