Messages in this thread Patch in this message | | | Date | Fri, 21 Aug 2009 14:43:18 GMT | From | tip-bot for Amerigo Wang <> | Subject | [tip:x86/urgent] x86: Fix an incorrect argument of reserve_bootmem() |
| |
Commit-ID: 3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7 Gitweb: http://git.kernel.org/tip/3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7 Author: Amerigo Wang <amwang@redhat.com> AuthorDate: Fri, 21 Aug 2009 04:34:45 -0400 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Fri, 21 Aug 2009 16:40:31 +0200
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>
--- 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 6176fe8..ea56b8c 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) {
| |