Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Paul Mackerras <paulus@samba.org>

+6 -21
-4
arch/powerpc/kernel/prom.c
··· 71 71 typedef int interpret_func(struct device_node *, unsigned long *, 72 72 int, int, int); 73 73 74 - extern struct rtas_t rtas; 75 - extern struct lmb lmb; 76 - extern unsigned long klimit; 77 - 78 74 static int __initdata dt_root_addr_cells; 79 75 static int __initdata dt_root_size_cells; 80 76
+2
arch/powerpc/kernel/setup-common.c
··· 69 69 EXPORT_SYMBOL(_machine); 70 70 #endif 71 71 72 + unsigned long klimit = (unsigned long) _end; 73 + 72 74 /* 73 75 * This still seems to be needed... -- paulus 74 76 */
+1 -2
arch/powerpc/kernel/setup_32.c
··· 279 279 /* Warning, IO base is not yet inited */ 280 280 void __init setup_arch(char **cmdline_p) 281 281 { 282 - extern char *klimit; 283 282 extern void do_init_bootmem(void); 284 283 285 284 /* so udelay does something sensible, assume <= 1000 bogomips */ ··· 337 338 init_mm.start_code = PAGE_OFFSET; 338 339 init_mm.end_code = (unsigned long) _etext; 339 340 init_mm.end_data = (unsigned long) _edata; 340 - init_mm.brk = (unsigned long) klimit; 341 + init_mm.brk = klimit; 341 342 342 343 /* Save unparsed command line copy for /proc/cmdline */ 343 344 strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
-8
arch/powerpc/kernel/setup_64.c
··· 96 96 do { udbg_putc = call_rtas_display_status_delay; } while(0) 97 97 #endif 98 98 99 - /* extern void *stab; */ 100 - extern unsigned long klimit; 101 - 102 - extern void mm_init_ppc64(void); 103 - extern void early_init_devtree(void *flat_dt); 104 - extern void unflatten_device_tree(void); 105 - extern void check_for_initrd(void); 106 - 107 99 int have_of = 1; 108 100 int boot_cpuid = 0; 109 101 int boot_cpuid_phys = 0;
-3
arch/powerpc/mm/init_32.c
··· 84 84 /* XXX should be in current.h -- paulus */ 85 85 extern struct task_struct *current_set[NR_CPUS]; 86 86 87 - char *klimit = _end; 88 - struct device_node *memory_node; 89 - 90 87 extern int init_bootmem_done; 91 88 92 89 /*
-2
arch/powerpc/mm/init_64.c
··· 80 80 #warning TASK_SIZE is smaller than it needs to be. 81 81 #endif 82 82 83 - unsigned long klimit = (unsigned long)_end; 84 - 85 83 /* max amount of RAM to use */ 86 84 unsigned long __max_memory; 87 85
+1 -2
arch/powerpc/platforms/iseries/setup.c
··· 40 40 #include <asm/iommu.h> 41 41 #include <asm/firmware.h> 42 42 #include <asm/systemcfg.h> 43 - 43 + #include <asm/system.h> 44 44 #include <asm/time.h> 45 45 #include <asm/paca.h> 46 46 #include <asm/cache.h> ··· 85 85 int piranha_simulator; 86 86 87 87 extern int rd_size; /* Defined in drivers/block/rd.c */ 88 - extern unsigned long klimit; 89 88 extern unsigned long embedded_sysmap_start; 90 89 extern unsigned long embedded_sysmap_end; 91 90
+1
include/asm-powerpc/system.h
··· 179 179 extern unsigned int rtas_data; 180 180 extern int mem_init_done; /* set on boot once kmalloc can be called */ 181 181 extern unsigned long memory_limit; 182 + extern unsigned long klimit; 182 183 183 184 extern int powersave_nap; /* set if nap mode can be used in idle loop */ 184 185
+1
include/asm-ppc64/mmu.h
··· 229 229 extern void hpte_init_native(void); 230 230 extern void hpte_init_lpar(void); 231 231 extern void hpte_init_iSeries(void); 232 + extern void mm_init_ppc64(void); 232 233 233 234 extern long pSeries_lpar_hpte_insert(unsigned long hpte_group, 234 235 unsigned long va, unsigned long prpn,