git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'linus/master' into HEAD
[safe/jmp/linux-2.6]
/
arch
/
x86
/
mm
/
init_32.c
diff --git
a/arch/x86/mm/init_32.c
b/arch/x86/mm/init_32.c
index
9ff3c08
..
3cd7711
100644
(file)
--- a/
arch/x86/mm/init_32.c
+++ b/
arch/x86/mm/init_32.c
@@
-111,7
+111,7
@@
static pte_t * __init one_page_table_init(pmd_t *pmd)
pte_t *page_table = NULL;
if (after_bootmem) {
-#if
def CONFIG_DEBUG_PAGEALLOC
+#if
defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KMEMCHECK)
page_table = (pte_t *) alloc_bootmem_pages(PAGE_SIZE);
#endif
if (!page_table)