Commit 40a5f7ca authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras

[POWERPC] PReP fixup after irq changes

Compile fixes for PReP in ARCH=ppc.
Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f5a92458
...@@ -45,7 +45,7 @@ static u_int NumSources; ...@@ -45,7 +45,7 @@ static u_int NumSources;
static int open_pic_irq_offset; static int open_pic_irq_offset;
static volatile OpenPIC_Source __iomem *ISR[NR_IRQS]; static volatile OpenPIC_Source __iomem *ISR[NR_IRQS];
static int openpic_cascade_irq = -1; static int openpic_cascade_irq = -1;
static int (*openpic_cascade_fn)(struct pt_regs *); static int (*openpic_cascade_fn)(void);
/* Global Operations */ /* Global Operations */
static void openpic_disable_8259_pass_through(void); static void openpic_disable_8259_pass_through(void);
...@@ -54,7 +54,7 @@ static void openpic_set_spurious(u_int vector); ...@@ -54,7 +54,7 @@ static void openpic_set_spurious(u_int vector);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* Interprocessor Interrupts */ /* Interprocessor Interrupts */
static void openpic_initipi(u_int ipi, u_int pri, u_int vector); static void openpic_initipi(u_int ipi, u_int pri, u_int vector);
static irqreturn_t openpic_ipi_action(int cpl, void *dev_id, struct pt_regs *); static irqreturn_t openpic_ipi_action(int cpl, void *dev_id);
#endif #endif
/* Timer Interrupts */ /* Timer Interrupts */
...@@ -700,7 +700,7 @@ static struct irqaction openpic_cascade_irqaction = { ...@@ -700,7 +700,7 @@ static struct irqaction openpic_cascade_irqaction = {
void __init void __init
openpic_hookup_cascade(u_int irq, char *name, openpic_hookup_cascade(u_int irq, char *name,
int (*cascade_fn)(struct pt_regs *)) int (*cascade_fn)(void))
{ {
openpic_cascade_irq = irq; openpic_cascade_irq = irq;
openpic_cascade_fn = cascade_fn; openpic_cascade_fn = cascade_fn;
...@@ -857,16 +857,16 @@ static void openpic_end_ipi(unsigned int irq_nr) ...@@ -857,16 +857,16 @@ static void openpic_end_ipi(unsigned int irq_nr)
{ {
} }
static irqreturn_t openpic_ipi_action(int cpl, void *dev_id, struct pt_regs *regs) static irqreturn_t openpic_ipi_action(int cpl, void *dev_id)
{ {
smp_message_recv(cpl-OPENPIC_VEC_IPI-open_pic_irq_offset, regs); smp_message_recv(cpl-OPENPIC_VEC_IPI-open_pic_irq_offset);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
int int
openpic_get_irq(struct pt_regs *regs) openpic_get_irq(void)
{ {
int irq = openpic_irq(); int irq = openpic_irq();
...@@ -876,7 +876,7 @@ openpic_get_irq(struct pt_regs *regs) ...@@ -876,7 +876,7 @@ openpic_get_irq(struct pt_regs *regs)
* This should move to irq.c eventually. -- paulus * This should move to irq.c eventually. -- paulus
*/ */
if (irq == openpic_cascade_irq && openpic_cascade_fn != NULL) { if (irq == openpic_cascade_irq && openpic_cascade_fn != NULL) {
int cirq = openpic_cascade_fn(regs); int cirq = openpic_cascade_fn();
/* Allow for the cascade being shared with other devices */ /* Allow for the cascade being shared with other devices */
if (cirq != -1) { if (cirq != -1) {
......
...@@ -48,12 +48,12 @@ extern void openpic_init(int linux_irq_offset); ...@@ -48,12 +48,12 @@ extern void openpic_init(int linux_irq_offset);
extern void openpic_init_nmi_irq(u_int irq); extern void openpic_init_nmi_irq(u_int irq);
extern void openpic_set_irq_priority(u_int irq, u_int pri); extern void openpic_set_irq_priority(u_int irq, u_int pri);
extern void openpic_hookup_cascade(u_int irq, char *name, extern void openpic_hookup_cascade(u_int irq, char *name,
int (*cascade_fn)(struct pt_regs *)); int (*cascade_fn)(void));
extern u_int openpic_irq(void); extern u_int openpic_irq(void);
extern void openpic_eoi(void); extern void openpic_eoi(void);
extern void openpic_request_IPIs(void); extern void openpic_request_IPIs(void);
extern void do_openpic_setup_cpu(void); extern void do_openpic_setup_cpu(void);
extern int openpic_get_irq(struct pt_regs *regs); extern int openpic_get_irq(void);
extern void openpic_reset_processor_phys(u_int cpumask); extern void openpic_reset_processor_phys(u_int cpumask);
extern void openpic_setup_ISU(int isu_num, unsigned long addr); extern void openpic_setup_ISU(int isu_num, unsigned long addr);
extern void openpic_cause_IPI(u_int ipi, cpumask_t cpumask); extern void openpic_cause_IPI(u_int ipi, cpumask_t cpumask);
...@@ -93,6 +93,6 @@ extern void openpic2_init(int linux_irq_offset); ...@@ -93,6 +93,6 @@ extern void openpic2_init(int linux_irq_offset);
extern void openpic2_init_nmi_irq(u_int irq); extern void openpic2_init_nmi_irq(u_int irq);
extern u_int openpic2_irq(void); extern u_int openpic2_irq(void);
extern void openpic2_eoi(void); extern void openpic2_eoi(void);
extern int openpic2_get_irq(struct pt_regs *regs); extern int openpic2_get_irq(void);
extern void openpic2_setup_ISU(int isu_num, unsigned long addr); extern void openpic2_setup_ISU(int isu_num, unsigned long addr);
#endif /* _PPC_KERNEL_OPEN_PIC_H */ #endif /* _PPC_KERNEL_OPEN_PIC_H */
...@@ -39,7 +39,7 @@ extern struct smp_ops_t *smp_ops; ...@@ -39,7 +39,7 @@ extern struct smp_ops_t *smp_ops;
extern void smp_send_tlb_invalidate(int); extern void smp_send_tlb_invalidate(int);
extern void smp_send_xmon_break(int cpu); extern void smp_send_xmon_break(int cpu);
struct pt_regs; struct pt_regs;
extern void smp_message_recv(int, struct pt_regs *); extern void smp_message_recv(int);
extern int __cpu_disable(void); extern int __cpu_disable(void);
extern void __cpu_die(unsigned int cpu); extern void __cpu_die(unsigned int cpu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment