summaryrefslogtreecommitdiff
path: root/arch/mips/mm/init.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-25 14:17:48 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-25 14:17:48 +0100
commit15e7f8b92aed71819411025279cd3df37f8c636b (patch)
tree6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /arch/mips/mm/init.c
parent21949f00a022e090a7e8bc9a01dfca88273c6146 (diff)
parentef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff)
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/mips/mm/init.c')
-rw-r--r--arch/mips/mm/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 8d1f4f363049..9e8d00389eef 100644
--- 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 ...