diff options
author | Olaf Hering <olaf@aepfle.de> | 2006-10-06 17:06:48 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-07 08:11:20 -0400 |
commit | 40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 (patch) | |
tree | d568687f532826dd5dca6639529aa9e58e612228 /include | |
parent | f5a924581a4e7b9bc29a49ee1397dcaaacd5f25f (diff) |
[POWERPC] PReP fixup after irq changes
Compile fixes for PReP in ARCH=ppc.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ppc/open_pic.h | 6 | ||||
-rw-r--r-- | include/asm-ppc/smp.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-ppc/open_pic.h b/include/asm-ppc/open_pic.h index a4fe962d9f73..778d5726212c 100644 --- a/include/asm-ppc/open_pic.h +++ b/include/asm-ppc/open_pic.h | |||
@@ -48,12 +48,12 @@ extern void openpic_init(int linux_irq_offset); | |||
48 | extern void openpic_init_nmi_irq(u_int irq); | 48 | extern void openpic_init_nmi_irq(u_int irq); |
49 | extern void openpic_set_irq_priority(u_int irq, u_int pri); | 49 | extern void openpic_set_irq_priority(u_int irq, u_int pri); |
50 | extern void openpic_hookup_cascade(u_int irq, char *name, | 50 | extern void openpic_hookup_cascade(u_int irq, char *name, |
51 | int (*cascade_fn)(struct pt_regs *)); | 51 | int (*cascade_fn)(void)); |
52 | extern u_int openpic_irq(void); | 52 | extern u_int openpic_irq(void); |
53 | extern void openpic_eoi(void); | 53 | extern void openpic_eoi(void); |
54 | extern void openpic_request_IPIs(void); | 54 | extern void openpic_request_IPIs(void); |
55 | extern void do_openpic_setup_cpu(void); | 55 | extern void do_openpic_setup_cpu(void); |
56 | extern int openpic_get_irq(struct pt_regs *regs); | 56 | extern int openpic_get_irq(void); |
57 | extern void openpic_reset_processor_phys(u_int cpumask); | 57 | extern void openpic_reset_processor_phys(u_int cpumask); |
58 | extern void openpic_setup_ISU(int isu_num, unsigned long addr); | 58 | extern void openpic_setup_ISU(int isu_num, unsigned long addr); |
59 | extern void openpic_cause_IPI(u_int ipi, cpumask_t cpumask); | 59 | extern void openpic_cause_IPI(u_int ipi, cpumask_t cpumask); |
@@ -93,6 +93,6 @@ extern void openpic2_init(int linux_irq_offset); | |||
93 | extern void openpic2_init_nmi_irq(u_int irq); | 93 | extern void openpic2_init_nmi_irq(u_int irq); |
94 | extern u_int openpic2_irq(void); | 94 | extern u_int openpic2_irq(void); |
95 | extern void openpic2_eoi(void); | 95 | extern void openpic2_eoi(void); |
96 | extern int openpic2_get_irq(struct pt_regs *regs); | 96 | extern int openpic2_get_irq(void); |
97 | extern void openpic2_setup_ISU(int isu_num, unsigned long addr); | 97 | extern void openpic2_setup_ISU(int isu_num, unsigned long addr); |
98 | #endif /* _PPC_KERNEL_OPEN_PIC_H */ | 98 | #endif /* _PPC_KERNEL_OPEN_PIC_H */ |
diff --git a/include/asm-ppc/smp.h b/include/asm-ppc/smp.h index 0b7fa89589df..e75791ea33a6 100644 --- a/include/asm-ppc/smp.h +++ b/include/asm-ppc/smp.h | |||
@@ -39,7 +39,7 @@ extern struct smp_ops_t *smp_ops; | |||
39 | extern void smp_send_tlb_invalidate(int); | 39 | extern void smp_send_tlb_invalidate(int); |
40 | extern void smp_send_xmon_break(int cpu); | 40 | extern void smp_send_xmon_break(int cpu); |
41 | struct pt_regs; | 41 | struct pt_regs; |
42 | extern void smp_message_recv(int, struct pt_regs *); | 42 | extern void smp_message_recv(int); |
43 | 43 | ||
44 | extern int __cpu_disable(void); | 44 | extern int __cpu_disable(void); |
45 | extern void __cpu_die(unsigned int cpu); | 45 | extern void __cpu_die(unsigned int cpu); |