From: Greg Ungerer Date: Wed, 24 Oct 2012 12:36:27 +0000 (+1000) Subject: m68k: merge MMU and non-MMU versions of mm/init.c X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~30^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd1cb3a7c43508c29e17836628090c0735bd3137;p=pandora-kernel.git m68k: merge MMU and non-MMU versions of mm/init.c Some of the code in the existing mm/init_mm.c and mm/init_no.c files is the same, and if we merge them back to a single file we can save some code duplication. Although the old mem_init() code for non-MMU was a little different than the MMU version, it turns out we can use the same code. So I now we just use the MMU mem_init() code for all. It also means we now get identical console info messages for this code on kernel boot up. So merge the two files back into a single file. Signed-off-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven --- Reading git-diff-tree failed