diff options
| author | Anton Blanchard <anton@samba.org> | 2002-06-14 08:12:09 +1000 |
|---|---|---|
| committer | Anton Blanchard <anton@samba.org> | 2002-06-14 08:12:09 +1000 |
| commit | fbc17786da80d888a7073841ece1e32c9069221f (patch) | |
| tree | e25ccfa621e9173b09fb8198790fdf135682df08 | |
| parent | 6ed6603ac4aec226751a68a5da26df573726b8e0 (diff) | |
ppc64: remove some stale code
| -rw-r--r-- | arch/ppc64/kernel/chrp_setup.c | 13 | ||||
| -rw-r--r-- | arch/ppc64/kernel/open_pic.c | 1 | ||||
| -rw-r--r-- | arch/ppc64/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/ppc64/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/ppc64/kernel/smp.c | 7 | ||||
| -rw-r--r-- | arch/ppc64/mm/init.c | 2 | ||||
| -rw-r--r-- | include/asm-ppc64/pgtable.h | 1 |
7 files changed, 4 insertions, 26 deletions
diff --git a/arch/ppc64/kernel/chrp_setup.c b/arch/ppc64/kernel/chrp_setup.c index 1db42229933a..5ffe593408e1 100644 --- a/arch/ppc64/kernel/chrp_setup.c +++ b/arch/ppc64/kernel/chrp_setup.c @@ -97,17 +97,9 @@ int fwnmi_active; /* TRUE if an FWNMI handler is present */ kdev_t boot_dev; unsigned long virtPython0Facilities = 0; // python0 facility area (memory mapped io) (64-bit format) VIRTUAL address. -extern HPTE *Hash, *Hash_end; -extern unsigned long Hash_size, Hash_mask; -extern int probingmem; extern unsigned long loops_per_jiffy; -#ifdef CONFIG_BLK_DEV_RAM -extern int rd_doload; /* 1 = load ramdisk, 0 = don't load */ -extern int rd_prompt; /* 1 = prompt for ramdisk, 0 = don't prompt */ -extern int rd_image_start; /* starting block # of image */ -#endif - +extern unsigned long ppc_proc_freq; extern unsigned long ppc_tb_freq; void @@ -365,9 +357,6 @@ chrp_progress(char *s, unsigned short hex) extern void setup_default_decr(void); -extern unsigned long ppc_proc_freq; -extern unsigned long ppc_tb_freq; - void __init pSeries_calibrate_decr(void) { struct device_node *cpu; diff --git a/arch/ppc64/kernel/open_pic.c b/arch/ppc64/kernel/open_pic.c index 7d2d1630a154..c1d52e0cc785 100644 --- a/arch/ppc64/kernel/open_pic.c +++ b/arch/ppc64/kernel/open_pic.c @@ -33,7 +33,6 @@ void* OpenPIC_Addr; static volatile struct OpenPIC *OpenPIC = NULL; u_int OpenPIC_NumInitSenses __initdata = 0; u_char *OpenPIC_InitSenses __initdata = NULL; -extern int use_of_interrupt_tree; void find_ISUs(void); diff --git a/arch/ppc64/kernel/process.c b/arch/ppc64/kernel/process.c index 916644cc27c7..b794c8585d58 100644 --- a/arch/ppc64/kernel/process.c +++ b/arch/ppc64/kernel/process.c @@ -44,8 +44,6 @@ #include <asm/machdep.h> #include <asm/iSeries/HvCallHpt.h> -int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpregs); - struct task_struct *last_task_used_math = NULL; struct mm_struct ioremap_mm = { pgd : ioremap_dir diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index 55da46d038ec..a7b69496f6cb 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c @@ -42,9 +42,6 @@ extern unsigned long klimit; extern HTAB htab_data; extern unsigned long loops_per_jiffy; -extern unsigned long embedded_sysmap_start; -extern unsigned long embedded_sysmap_end; - int have_of = 1; extern void chrp_init(unsigned long r3, @@ -53,7 +50,6 @@ extern void chrp_init(unsigned long r3, unsigned long r6, unsigned long r7); -extern void chrp_init_map_io_space( void ); extern void iSeries_init( void ); extern void iSeries_init_early( void ); extern void pSeries_init_early( void ); diff --git a/arch/ppc64/kernel/smp.c b/arch/ppc64/kernel/smp.c index 7b8819cb959b..ffba3e7ea509 100644 --- a/arch/ppc64/kernel/smp.c +++ b/arch/ppc64/kernel/smp.c @@ -28,7 +28,6 @@ #define __KERNEL_SYSCALLS__ #include <linux/unistd.h> #include <linux/init.h> -/* #include <linux/openpic.h> */ #include <linux/spinlock.h> #include <linux/cache.h> #include <linux/err.h> @@ -65,10 +64,6 @@ unsigned long cpu_online_map; volatile unsigned long cpu_callin_map[NR_CPUS] = {0,}; -#define TB_SYNC_PASSES 4 -volatile unsigned long __initdata tb_sync_flag = 0; -volatile unsigned long __initdata tb_offset = 0; - extern unsigned char stab_array[]; int start_secondary(void *); @@ -724,7 +719,7 @@ void __init smp_setup(char *str, int *ints) { } -int __init setup_profiling_timer(unsigned int multiplier) +int setup_profiling_timer(unsigned int multiplier) { return 0; } diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c index 8dd8254a93d1..35f9ec6ad6b3 100644 --- a/arch/ppc64/mm/init.c +++ b/arch/ppc64/mm/init.c @@ -98,7 +98,7 @@ mmu_gather_t mmu_gathers[NR_CPUS]; void show_mem(void) { - int i,free = 0,total = 0,reserved = 0; + int i,total = 0,reserved = 0; int shared = 0, cached = 0; printk("Mem-info:\n"); diff --git a/include/asm-ppc64/pgtable.h b/include/asm-ppc64/pgtable.h index e459be1e8644..5eedbc705e13 100644 --- a/include/asm-ppc64/pgtable.h +++ b/include/asm-ppc64/pgtable.h @@ -349,6 +349,7 @@ extern void paging_init(void); * ahead of time, instead of waiting for the inevitable extra * hash-table miss exception. */ +struct vm_area_struct; extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t); /* Encode and de-code a swap entry */ |
