From 9e45dd688a1860a5e1e84844e43abf881564edb5 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 5 Feb 2012 01:22:29 +0100 Subject: ARM: Remove duplicate asm/memblock.h include from arch/arm/mm/init.c There's no need to include the header twice, so get rid of the duplicate. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina --- arch/arm/mm/init.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mm/init.c') diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 5dc7d127a40f..245a55a0a5bb 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -32,7 +32,6 @@ #include #include -#include #include "mm.h" -- cgit v1.2.3 From d9277d51a8eeaa097d3c1385f458c99d65ffc4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Wed, 1 Feb 2012 11:16:51 +0100 Subject: ARM: 7312/1: only show modules in the memory layout for MODULES=y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This line is irritating and wrong when modules are not supported, so don't show it then. Signed-off-by: Uwe Kleine-König Acked-by: Nicolas Pitre Acked-by: Linus Walleij Signed-off-by: Russell King --- arch/arm/mm/init.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/mm/init.c') 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) #ifdef CONFIG_HIGHMEM " pkmap : 0x%08lx - 0x%08lx (%4ld MB)\n" #endif +#ifdef CONFIG_MODULES " modules : 0x%08lx - 0x%08lx (%4ld MB)\n" +#endif " .text : 0x%p" " - 0x%p" " (%4d kB)\n" " .init : 0x%p" " - 0x%p" " (%4d kB)\n" " .data : 0x%p" " - 0x%p" " (%4d kB)\n" @@ -678,7 +680,9 @@ void __init mem_init(void) MLM(PKMAP_BASE, (PKMAP_BASE) + (LAST_PKMAP) * (PAGE_SIZE)), #endif +#ifdef CONFIG_MODULES MLM(MODULES_VADDR, MODULES_END), +#endif MLK_ROUNDUP(_text, _etext), MLK_ROUNDUP(__init_begin, __init_end), -- cgit v1.2.3