summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>2013-02-16 23:33:34 -0200
committerGreg Ungerer <gerg@uclinux.org>2013-03-04 11:08:39 +1000
commitbe3f695cbe3ddd7f334a660b82ae866818ae4b10 (patch)
treefea159481e76965c853455d8a1a46477083fec88 /arch/m68k
parent1a62fe8d1b26223abba31e9a81005d550822a1f8 (diff)
downloadlinux-stable-be3f695cbe3ddd7f334a660b82ae866818ae4b10.tar.gz
linux-stable-be3f695cbe3ddd7f334a660b82ae866818ae4b10.tar.bz2
linux-stable-be3f695cbe3ddd7f334a660b82ae866818ae4b10.zip
m68knommu: fix build when CPU is not coldfire
Commit dd1cb3a7c43508c29e17836628090c0735bd3137 [merge MMU and non-MMU versions of mm/init.c] unified mm/init.c for both MMU and non-MMU m68k platforms. However, it broke when we build a non-MMU M68K Classic CPU kernel. This fix builds a section that came from the MMU version only when we are building a MMU kernel. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index afd8106fd83b..519aad8fa812 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -188,7 +188,7 @@ void __init mem_init(void)
}
}
-#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
+#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
/* insert pointer tables allocated so far into the tablelist */
init_pointer_table((unsigned long)kernel_pg_dir);
for (i = 0; i < PTRS_PER_PGD; i++) {