From: Amerigo Wang Date: Fri, 21 Aug 2009 08:34:45 +0000 (-0400) Subject: x86: Fix an incorrect argument of reserve_bootmem() X-Git-Tag: Ubuntu-5.2.0-15.16~28362^2~1 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a6a06f7b577f89d0b916c5ccaff67ca5ed444a78;p=mirror_ubuntu-eoan-kernel.git 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 Cc: Yinghai Lu Cc: akpm@linux-foundation.org LKML-Reference: <20090821083709.5098.52505.sendpatchset@localhost.localdomain> Signed-off-by: Ingo Molnar --- 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) {