diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /arch/ppc/kernel | |
parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) |
Merge with Linux 2.3.51.
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r-- | arch/ppc/kernel/chrp_time.c | 2 | ||||
-rw-r--r-- | arch/ppc/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/ppc/kernel/open_pic.c | 4 | ||||
-rw-r--r-- | arch/ppc/kernel/prom.c | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/arch/ppc/kernel/chrp_time.c b/arch/ppc/kernel/chrp_time.c index d55fa24c0..c692b54d0 100644 --- a/arch/ppc/kernel/chrp_time.c +++ b/arch/ppc/kernel/chrp_time.c @@ -173,7 +173,7 @@ void __init chrp_calibrate_decr(void) } freq *= 30; divisor = 30; - printk("time_init: decrementer frequency = %lu/%d (%d MHz)\n", freq, + printk("time_init: decrementer frequency = %lu/%d (%ld MHz)\n", freq, divisor, (freq/divisor)>>20); decrementer_count = freq / HZ / divisor; count_period_num = divisor; diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c index f8e11ecc0..e4b279032 100644 --- a/arch/ppc/kernel/irq.c +++ b/arch/ppc/kernel/irq.c @@ -677,7 +677,7 @@ static int irq_affinity_write_proc (struct file *file, const char *buffer, err = parse_hex_value(buffer, count, &new_value); -#if CONFIG_SMP +#if 0/*CONFIG_SMP*/ /* * Do not allow disabling IRQs completely - it's a too easy * way to make the system unusable accidentally :-) At least diff --git a/arch/ppc/kernel/open_pic.c b/arch/ppc/kernel/open_pic.c index 301a82ba8..9438c57ee 100644 --- a/arch/ppc/kernel/open_pic.c +++ b/arch/ppc/kernel/open_pic.c @@ -97,7 +97,7 @@ struct hw_interrupt_type open_pic = { #define check_arg_cpu(cpu) do {} while (0) #endif -static void no_action(int ir1, void *dev, struct pt_regs *regs) +void no_action(int ir1, void *dev, struct pt_regs *regs) { } @@ -301,7 +301,7 @@ void find_ISUs(void) NumSources = 0x10; #else /* for non-distributed OpenPIC implementations it's in the IDU -- Cort */ - ISU = OpenPIC->Source; + ISU = (OpenPIC_Source *)OpenPIC->Source; #endif } diff --git a/arch/ppc/kernel/prom.c b/arch/ppc/kernel/prom.c index 310e301e6..a987b8fd6 100644 --- a/arch/ppc/kernel/prom.c +++ b/arch/ppc/kernel/prom.c @@ -114,9 +114,6 @@ static struct device_node *allnodes = 0; static void clearscreen(void); static void flushscreen(void); -void prom_drawchar(char c); -void prom_drawstring(const char *c); -void prom_drawhex(unsigned long v); static void scrollscreen(void); static void draw_byte(unsigned char c, long locX, long locY); |