From be3a2dc1f815cf06dddd3c38ce153b65036f6c97 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: [PATCH] --- yaml --- r: 297584 b: refs/heads/master c: d9277d51a8eeaa097d3c1385f458c99d65ffc4f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3a0085b7fe62..dadfc74036f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7f464f3db93ae5492bee6f6e48939fd8a45fa99 +refs/heads/master: d9277d51a8eeaa097d3c1385f458c99d65ffc4f4 diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index 6ec1226fc62d..42d906f89964 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/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),