diff options
| author | Amerigo Wang <amwang@redhat.com> | 2009-08-21 10:34:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-21 16:40:31 +0200 |
| commit | 3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7 (patch) | |
| tree | faa3358dc3a2132e322f2728ed5858f4bf05abcf /arch/x86 | |
| parent | x86: Fix system crash when loading with "reservetop" parameter (diff) | |
| download | linux-3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7.tar.xz linux-3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7.zip | |
x86: Fix an incorrect argument of reserve_bootmem()
This line looks suspicious, because if this is true, then the
'flags' parameter of function reserve_bootmem_generic() will be
unused when !CONFIG_NUMA. I don't think this is what we want.
Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: akpm@linux-foundation.org
LKML-Reference: <20090821083709.5098.52505.sendpatchset@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/init_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 6176fe8f29e0..ea56b8cbb6a6 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -796,7 +796,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, return ret; #else - reserve_bootmem(phys, len, BOOTMEM_DEFAULT); + reserve_bootmem(phys, len, flags); #endif if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) { |