git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
init_64.c
diff --git
a/arch/x86/mm/init_64.c
b/arch/x86/mm/init_64.c
index
6176fe8
..
ea56b8c
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) {