diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /arch/ppc/kernel | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'arch/ppc/kernel')
| -rw-r--r-- | arch/ppc/kernel/apus_setup.c | 6 | ||||
| -rw-r--r-- | arch/ppc/kernel/prep_setup.c | 4 | ||||
| -rw-r--r-- | arch/ppc/kernel/smp.c | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/arch/ppc/kernel/apus_setup.c b/arch/ppc/kernel/apus_setup.c index d75663be5..5979c9312 100644 --- a/arch/ppc/kernel/apus_setup.c +++ b/arch/ppc/kernel/apus_setup.c @@ -82,13 +82,13 @@ char debug_device[6] __apusdata = ""; extern void amiga_init_IRQ(void); -void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata; +void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata = NULL; /* machine dependent keyboard functions */ -int (*mach_keyb_init) (void) __initdata; +int (*mach_keyb_init) (void) __initdata = NULL; int (*mach_kbdrate) (struct kbd_repeat *) __apusdata = NULL; void (*mach_kbd_leds) (unsigned int) __apusdata = NULL; /* machine dependent irq functions */ -void (*mach_init_IRQ) (void) __initdata; +void (*mach_init_IRQ) (void) __initdata = NULL; void (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) __apusdata = NULL; void (*mach_get_model) (char *model) __apusdata = NULL; int (*mach_get_hardware_list) (char *buffer) __apusdata = NULL; diff --git a/arch/ppc/kernel/prep_setup.c b/arch/ppc/kernel/prep_setup.c index d72e74735..6e30462aa 100644 --- a/arch/ppc/kernel/prep_setup.c +++ b/arch/ppc/kernel/prep_setup.c @@ -384,8 +384,8 @@ void __init prep_res_calibrate_decr(void) * 2 following ones measure the interval. The precision of the method * is still doubtful due to the short interval sampled. */ -static __initdata volatile int calibrate_steps = 3; -static __initdata unsigned tbstamp; +static volatile int calibrate_steps __initdata = 3; +static unsigned tbstamp __initdata = 0; void __init prep_calibrate_decr_handler(int irq, diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c index 0a66d6c6b..fb7f38444 100644 --- a/arch/ppc/kernel/smp.c +++ b/arch/ppc/kernel/smp.c @@ -41,8 +41,8 @@ #include <asm/time.h> #include "open_pic.h" -int smp_threads_ready = 0; -volatile int smp_commenced = 0; +int smp_threads_ready; +volatile int smp_commenced; int smp_num_cpus = 1; struct cpuinfo_PPC cpu_data[NR_CPUS]; struct klock_info_struct klock_info = { KLOCK_CLEAR, 0 }; @@ -54,10 +54,10 @@ unsigned int prof_counter[NR_CPUS]; cycles_t cacheflush_time; /* this has to go in the data section because it is accessed from prom_init */ -int smp_hw_index[NR_CPUS] = {0}; +int smp_hw_index[NR_CPUS]; /* all cpu mappings are 1-1 -- Cort */ -volatile unsigned long cpu_callin_map[NR_CPUS] = {0,}; +volatile unsigned long cpu_callin_map[NR_CPUS]; int start_secondary(void *); extern int cpu_idle(void *unused); @@ -226,7 +226,7 @@ static volatile struct call_data_struct { atomic_t started; atomic_t finished; int wait; -} *call_data = NULL; +} *call_data; /* * this function sends a 'generic call function' IPI to all other CPUs |