2850bc2737
m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
45 lines
1012 B
C
45 lines
1012 B
C
#include <linux/interrupt.h>
|
|
|
|
#include <asm/irq.h>
|
|
#include <asm/traps.h>
|
|
#include <asm/apollohw.h>
|
|
|
|
void dn_process_int(unsigned int irq, struct pt_regs *fp)
|
|
{
|
|
__m68k_handle_int(irq, fp);
|
|
|
|
*(volatile unsigned char *)(pica)=0x20;
|
|
*(volatile unsigned char *)(picb)=0x20;
|
|
}
|
|
|
|
int apollo_irq_startup(unsigned int irq)
|
|
{
|
|
if (irq < 8)
|
|
*(volatile unsigned char *)(pica+1) &= ~(1 << irq);
|
|
else
|
|
*(volatile unsigned char *)(picb+1) &= ~(1 << (irq - 8));
|
|
return 0;
|
|
}
|
|
|
|
void apollo_irq_shutdown(unsigned int irq)
|
|
{
|
|
if (irq < 8)
|
|
*(volatile unsigned char *)(pica+1) |= (1 << irq);
|
|
else
|
|
*(volatile unsigned char *)(picb+1) |= (1 << (irq - 8));
|
|
}
|
|
|
|
static struct irq_controller apollo_irq_controller = {
|
|
.name = "apollo",
|
|
.lock = SPIN_LOCK_UNLOCKED,
|
|
.startup = apollo_irq_startup,
|
|
.shutdown = apollo_irq_shutdown,
|
|
};
|
|
|
|
|
|
void dn_init_IRQ(void)
|
|
{
|
|
m68k_setup_user_interrupt(VEC_USER + 96, 16, dn_process_int);
|
|
m68k_setup_irq_controller(&apollo_irq_controller, IRQ_APOLLO, 16);
|
|
}
|