git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
mm
/
init.c
diff --git
a/arch/mips/mm/init.c
b/arch/mips/mm/init.c
index 8d1f4f36304900fa5bb33d23a31a4cc4deaefe94..9e8d00389eef18e0c99b4e2343632d1533554a42 100644
(file)
--- a/
arch/mips/mm/init.c
+++ b/
arch/mips/mm/init.c
@@
-462,7
+462,9
@@
void __init_refok free_initmem(void)
__pa_symbol(&__init_end));
}
+#ifndef CONFIG_MIPS_PGD_C0_CONTEXT
unsigned long pgd_current[NR_CPUS];
+#endif
/*
* On 64-bit we've got three-level pagetables with a slightly
* different layout ...