From ebd91604692842e7b58112fc00f490d46f46ded5 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 17 Dec 2012 15:59:27 -0800 Subject: [PATCH] --- yaml --- r: 346343 b: refs/heads/master c: 3515b737d3c1377874c5cba8b7db3d2477da3af3 h: refs/heads/master i: 346341: 1fdb297e799971c9e8b0f7ff34bc6d6c7d5cd6bc 346339: ded773b4fdf54df2ff3f47744987965c0907afe4 346335: 70f3e9bb6dda7e811beaacd2779a2f9124057831 v: v3 --- [refs] | 2 +- trunk/arch/frv/kernel/setup.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1a95712732f5..de84f209f239 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 275b8b8917b92822442d6739807a3e033ddbeb5e +refs/heads/master: 3515b737d3c1377874c5cba8b7db3d2477da3af3 diff --git a/trunk/arch/frv/kernel/setup.c b/trunk/arch/frv/kernel/setup.c index 961e18495589..3cb3392f799e 100644 --- a/trunk/arch/frv/kernel/setup.c +++ b/trunk/arch/frv/kernel/setup.c @@ -804,9 +804,9 @@ void __init setup_arch(char **cmdline_p) BUG_ON(memory_start == memory_end); - init_mm.start_code = (unsigned long) &_stext; - init_mm.end_code = (unsigned long) &_etext; - init_mm.end_data = (unsigned long) &_edata; + init_mm.start_code = (unsigned long) _stext; + init_mm.end_code = (unsigned long) _etext; + init_mm.end_data = (unsigned long) _edata; #if 0 /* DAVIDM - don't set brk just incase someone decides to use it */ init_mm.brk = (unsigned long) &_end; #else @@ -814,10 +814,8 @@ void __init setup_arch(char **cmdline_p) #endif #ifdef DEBUG - printk("KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x BSS=0x%06x-0x%06x\n", - (int) &_stext, (int) &_etext, - (int) &_sdata, (int) &_edata, - (int) &__bss_start, (int) &__bss_stop); + printk("KERNEL -> TEXT=0x%p-0x%p DATA=0x%p-0x%p BSS=0x%p-0x%p\n", + _stext, _etext, _sdata, _edata, __bss_start, __bss_stop); #endif #ifdef CONFIG_VT