From 4008b35caaf3b39979355c2e7dbfcd1bf999bb86 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 23 Aug 2011 15:42:36 +1000 Subject: [PATCH] --- yaml --- r: 267244 b: refs/heads/master c: 7a79a80f50a9c7f76b257a3a55dd6a055e6893cf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/page_no.h | 3 +++ trunk/arch/m68k/kernel/setup_no.c | 2 -- trunk/arch/m68k/mm/init_no.c | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c520d7f2b9f8..3b7a0192ebd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3998bfbf310fd3efa19b9b2d420773157ee1d1b2 +refs/heads/master: 7a79a80f50a9c7f76b257a3a55dd6a055e6893cf diff --git a/trunk/arch/m68k/include/asm/page_no.h b/trunk/arch/m68k/include/asm/page_no.h index 90595721185f..a8d1c60eb9ce 100644 --- a/trunk/arch/m68k/include/asm/page_no.h +++ b/trunk/arch/m68k/include/asm/page_no.h @@ -5,6 +5,9 @@ extern unsigned long memory_start; extern unsigned long memory_end; +extern unsigned long _rambase; +extern unsigned long _ramstart; +extern unsigned long _ramend; #define get_user_page(vaddr) __get_free_page(GFP_KERNEL) #define free_user_page(page, addr) free_page(addr) diff --git a/trunk/arch/m68k/kernel/setup_no.c b/trunk/arch/m68k/kernel/setup_no.c index d5a616f6fb78..2ed8c0fb1517 100644 --- a/trunk/arch/m68k/kernel/setup_no.c +++ b/trunk/arch/m68k/kernel/setup_no.c @@ -81,8 +81,6 @@ void (*mach_power_off)(void); #define CPU_INSTR_PER_JIFFY 16 #endif -extern int _ramstart, _ramend; - #if defined(CONFIG_UBOOT) /* * parse_uboot_commandline diff --git a/trunk/arch/m68k/mm/init_no.c b/trunk/arch/m68k/mm/init_no.c index 3cf5a50b1494..1e33d39ca9a0 100644 --- a/trunk/arch/m68k/mm/init_no.c +++ b/trunk/arch/m68k/mm/init_no.c @@ -76,7 +76,6 @@ void __init mem_init(void) { int codek = 0, datak = 0, initk = 0; unsigned long tmp; - extern unsigned int _ramend, _rambase; unsigned long len = _ramend - _rambase; unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */ unsigned long end_mem = memory_end; /* DAVIDM - this must not include kernel stack at top */