projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc0ce23
)
x86: Fix an incorrect argument of reserve_bootmem()
author
Amerigo Wang
<
[email protected]
>
Fri, 21 Aug 2009 08:34:45 +0000
(
04:34
-0400)
committer
Ingo Molnar
<
[email protected]
>
Mon, 24 Aug 2009 18:22:55 +0000
(20:22 +0200)
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 <
[email protected]
>
Cc: Yinghai Lu <
[email protected]
>
Cc:
[email protected]
LKML-Reference: <
20090821083709
[email protected]
>
Signed-off-by: Ingo Molnar <
[email protected]
>
arch/x86/mm/init_64.c
patch
|
blob
|
history
diff --git
a/arch/x86/mm/init_64.c
b/arch/x86/mm/init_64.c
index 6176fe8f29e0138ec1cb6742f65b177010846aab..ea56b8cbb6a6dd6de89ec04d9e0543ff6908395f 100644
(file)
--- 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) {