diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-03-22 09:13:06 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-03-22 14:25:41 -0400 |
commit | 9e9630481ee8ef33f1cce71ce3636169fa37cd49 (patch) | |
tree | 8606ad801c849b96863ad65a94b536bfe09fb7d6 /arch/x86/kernel/setup_64.c | |
parent | 028011e1391eab27e7bc113c2ac08d4f55584a75 (diff) |
x86: revert: reserve dma32 early for gart
Revert
commit f62f1fc9ef94f74fda2b456d935ba2da69fa0a40
Author: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Fri Mar 7 15:02:50 2008 -0800
x86: reserve dma32 early for gart
The patch has a dependency on bootmem modifications which are not .25
material that late in the -rc cycle. The problem which is addressed by
the patch is limited to machines with 256G and more memory booted with
NUMA disabled. This is not a .25 regression and the audience which is
affected by this problem is very limited, so it's safer to do the
revert than pulling in intrusive bootmem changes right now.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r-- | arch/x86/kernel/setup_64.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index a775fe3de955..7637dc91c79b 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
@@ -389,8 +389,6 @@ void __init setup_arch(char **cmdline_p) | |||
389 | 389 | ||
390 | early_res_to_bootmem(); | 390 | early_res_to_bootmem(); |
391 | 391 | ||
392 | dma32_reserve_bootmem(); | ||
393 | |||
394 | #ifdef CONFIG_ACPI_SLEEP | 392 | #ifdef CONFIG_ACPI_SLEEP |
395 | /* | 393 | /* |
396 | * Reserve low memory region for sleep support. | 394 | * Reserve low memory region for sleep support. |