From f78f06177ce2f761bf61fe90af4b3ff3f79adc1e Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 26 May 2010 07:37:57 +0100 Subject: [PATCH] --- yaml --- r: 200285 b: refs/heads/master c: ea208f646c8fb91c39c852e952fc911e1ad045ab h: refs/heads/master i: 200283: 5d36ec0e29d3c85d52225bf0de9df103e5675ac4 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4c2021c3a6e0..309e9b775316 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 138de1c44a8e0606501cd8593407e9248e84f1b7 +refs/heads/master: ea208f646c8fb91c39c852e952fc911e1ad045ab diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index 1ba6cf5a2c02..f6a999465323 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/arch/arm/mm/init.c @@ -678,10 +678,10 @@ void __init mem_init(void) void free_initmem(void) { #ifdef CONFIG_HAVE_TCM - extern char *__tcm_start, *__tcm_end; + extern char __tcm_start, __tcm_end; - totalram_pages += free_area(__phys_to_pfn(__pa(__tcm_start)), - __phys_to_pfn(__pa(__tcm_end)), + totalram_pages += free_area(__phys_to_pfn(__pa(&__tcm_start)), + __phys_to_pfn(__pa(&__tcm_end)), "TCM link"); #endif