aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2012-02-01 05:16:51 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-24 05:38:52 -0400
commitd9277d51a8eeaa097d3c1385f458c99d65ffc4f4 (patch)
tree83690616d9953c6ebcb92755a1414690d6a6cf71
parenta7f464f3db93ae5492bee6f6e48939fd8a45fa99 (diff)
ARM: 7312/1: only show modules in the memory layout for MODULES=y
This line is irritating and wrong when modules are not supported, so don't show it then. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/init.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 6ec1226fc62d..42d906f89964 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -659,7 +659,9 @@ void __init mem_init(void)
659#ifdef CONFIG_HIGHMEM 659#ifdef CONFIG_HIGHMEM
660 " pkmap : 0x%08lx - 0x%08lx (%4ld MB)\n" 660 " pkmap : 0x%08lx - 0x%08lx (%4ld MB)\n"
661#endif 661#endif
662#ifdef CONFIG_MODULES
662 " modules : 0x%08lx - 0x%08lx (%4ld MB)\n" 663 " modules : 0x%08lx - 0x%08lx (%4ld MB)\n"
664#endif
663 " .text : 0x%p" " - 0x%p" " (%4d kB)\n" 665 " .text : 0x%p" " - 0x%p" " (%4d kB)\n"
664 " .init : 0x%p" " - 0x%p" " (%4d kB)\n" 666 " .init : 0x%p" " - 0x%p" " (%4d kB)\n"
665 " .data : 0x%p" " - 0x%p" " (%4d kB)\n" 667 " .data : 0x%p" " - 0x%p" " (%4d kB)\n"
@@ -678,7 +680,9 @@ void __init mem_init(void)
678 MLM(PKMAP_BASE, (PKMAP_BASE) + (LAST_PKMAP) * 680 MLM(PKMAP_BASE, (PKMAP_BASE) + (LAST_PKMAP) *
679 (PAGE_SIZE)), 681 (PAGE_SIZE)),
680#endif 682#endif
683#ifdef CONFIG_MODULES
681 MLM(MODULES_VADDR, MODULES_END), 684 MLM(MODULES_VADDR, MODULES_END),
685#endif
682 686
683 MLK_ROUNDUP(_text, _etext), 687 MLK_ROUNDUP(_text, _etext),
684 MLK_ROUNDUP(__init_begin, __init_end), 688 MLK_ROUNDUP(__init_begin, __init_end),