Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b09853 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Move some extern declarations from C code into headers 



This also make klimit have the same type on 32-bit as on 64-bit,
namely unsigned long, and defines and initializes it in one place.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d3d2176a

arch/powerpc/kernel/prom.c

+0 −4
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ struct isa_reg_property { 
typedef int interpret_func(struct device_node *, unsigned long *,

			   int, int, int);



extern struct rtas_t rtas;

extern struct lmb lmb;

extern unsigned long klimit;



static int __initdata dt_root_addr_cells;

static int __initdata dt_root_size_cells;

arch/powerpc/kernel/setup-common.c

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ int _machine = 0; 
EXPORT_SYMBOL(_machine);

#endif



unsigned long klimit = (unsigned long) _end;



/*

 * This still seems to be needed... -- paulus

 */

arch/powerpc/kernel/setup_32.c

+1 −2
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ arch_initcall(ppc_init); 
/* Warning, IO base is not yet inited */

void __init setup_arch(char **cmdline_p)

{

	extern char *klimit;

	extern void do_init_bootmem(void);



	/* so udelay does something sensible, assume <= 1000 bogomips */
@@ -338,7 +337,7 @@ void __init setup_arch(char **cmdline_p) 
	init_mm.start_code = PAGE_OFFSET;

	init_mm.end_code = (unsigned long) _etext;

	init_mm.end_data = (unsigned long) _edata;

	init_mm.brk = (unsigned long) klimit;

	init_mm.brk = klimit;



	/* Save unparsed command line copy for /proc/cmdline */

	strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);

arch/powerpc/kernel/setup_64.c

+0 −8
Original line number Diff line number Diff line
@@ -96,14 +96,6 @@ extern void udbg_init_maple_realmode(void); 
	do { udbg_putc = call_rtas_display_status_delay; } while(0)

#endif



/* extern void *stab; */

extern unsigned long klimit;



extern void mm_init_ppc64(void);

extern void early_init_devtree(void *flat_dt);

extern void unflatten_device_tree(void);

extern void check_for_initrd(void);



int have_of = 1;

int boot_cpuid = 0;

int boot_cpuid_phys = 0;

arch/powerpc/mm/init_32.c

+0 −3
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ void MMU_init(void); 
/* XXX should be in current.h  -- paulus */

extern struct task_struct *current_set[NR_CPUS];



char *klimit = _end;

struct device_node *memory_node;



extern int init_bootmem_done;



/*