Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2850bc27 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m68k pt_regs fixes 



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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 00079e04

arch/m68k/amiga/amiints.c

+20 −20
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ 


static void amiga_enable_irq(unsigned int irq);

static void amiga_disable_irq(unsigned int irq);

static irqreturn_t ami_int1(int irq, void *dev_id, struct pt_regs *fp);

static irqreturn_t ami_int3(int irq, void *dev_id, struct pt_regs *fp);

static irqreturn_t ami_int4(int irq, void *dev_id, struct pt_regs *fp);

static irqreturn_t ami_int5(int irq, void *dev_id, struct pt_regs *fp);

static irqreturn_t ami_int1(int irq, void *dev_id);

static irqreturn_t ami_int3(int irq, void *dev_id);

static irqreturn_t ami_int4(int irq, void *dev_id);

static irqreturn_t ami_int5(int irq, void *dev_id);



static struct irq_controller amiga_irq_controller = {

	.name		= "amiga",
@@ -113,98 +113,98 @@ static void amiga_disable_irq(unsigned int irq) 
 * The builtin Amiga hardware interrupt handlers.

 */



static irqreturn_t ami_int1(int irq, void *dev_id, struct pt_regs *fp)

static irqreturn_t ami_int1(int irq, void *dev_id)

{

	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;



	/* if serial transmit buffer empty, interrupt */

	if (ints & IF_TBE) {

		amiga_custom.intreq = IF_TBE;

		m68k_handle_int(IRQ_AMIGA_TBE, fp);

		m68k_handle_int(IRQ_AMIGA_TBE);

	}



	/* if floppy disk transfer complete, interrupt */

	if (ints & IF_DSKBLK) {

		amiga_custom.intreq = IF_DSKBLK;

		m68k_handle_int(IRQ_AMIGA_DSKBLK, fp);

		m68k_handle_int(IRQ_AMIGA_DSKBLK);

	}



	/* if software interrupt set, interrupt */

	if (ints & IF_SOFT) {

		amiga_custom.intreq = IF_SOFT;

		m68k_handle_int(IRQ_AMIGA_SOFT, fp);

		m68k_handle_int(IRQ_AMIGA_SOFT);

	}

	return IRQ_HANDLED;

}



static irqreturn_t ami_int3(int irq, void *dev_id, struct pt_regs *fp)

static irqreturn_t ami_int3(int irq, void *dev_id)

{

	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;



	/* if a blitter interrupt */

	if (ints & IF_BLIT) {

		amiga_custom.intreq = IF_BLIT;

		m68k_handle_int(IRQ_AMIGA_BLIT, fp);

		m68k_handle_int(IRQ_AMIGA_BLIT);

	}



	/* if a copper interrupt */

	if (ints & IF_COPER) {

		amiga_custom.intreq = IF_COPER;

		m68k_handle_int(IRQ_AMIGA_COPPER, fp);

		m68k_handle_int(IRQ_AMIGA_COPPER);

	}



	/* if a vertical blank interrupt */

	if (ints & IF_VERTB) {

		amiga_custom.intreq = IF_VERTB;

		m68k_handle_int(IRQ_AMIGA_VERTB, fp);

		m68k_handle_int(IRQ_AMIGA_VERTB);

	}

	return IRQ_HANDLED;

}



static irqreturn_t ami_int4(int irq, void *dev_id, struct pt_regs *fp)

static irqreturn_t ami_int4(int irq, void *dev_id)

{

	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;



	/* if audio 0 interrupt */

	if (ints & IF_AUD0) {

		amiga_custom.intreq = IF_AUD0;

		m68k_handle_int(IRQ_AMIGA_AUD0, fp);

		m68k_handle_int(IRQ_AMIGA_AUD0);

	}



	/* if audio 1 interrupt */

	if (ints & IF_AUD1) {

		amiga_custom.intreq = IF_AUD1;

		m68k_handle_int(IRQ_AMIGA_AUD1, fp);

		m68k_handle_int(IRQ_AMIGA_AUD1);

	}



	/* if audio 2 interrupt */

	if (ints & IF_AUD2) {

		amiga_custom.intreq = IF_AUD2;

		m68k_handle_int(IRQ_AMIGA_AUD2, fp);

		m68k_handle_int(IRQ_AMIGA_AUD2);

	}



	/* if audio 3 interrupt */

	if (ints & IF_AUD3) {

		amiga_custom.intreq = IF_AUD3;

		m68k_handle_int(IRQ_AMIGA_AUD3, fp);

		m68k_handle_int(IRQ_AMIGA_AUD3);

	}

	return IRQ_HANDLED;

}



static irqreturn_t ami_int5(int irq, void *dev_id, struct pt_regs *fp)

static irqreturn_t ami_int5(int irq, void *dev_id)

{

	unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;



	/* if serial receive buffer full interrupt */

	if (ints & IF_RBF) {

		/* acknowledge of IF_RBF must be done by the serial interrupt */

		m68k_handle_int(IRQ_AMIGA_RBF, fp);

		m68k_handle_int(IRQ_AMIGA_RBF);

	}



	/* if a disk sync interrupt */

	if (ints & IF_DSKSYN) {

		amiga_custom.intreq = IF_DSKSYN;

		m68k_handle_int(IRQ_AMIGA_DSKSYN, fp);

		m68k_handle_int(IRQ_AMIGA_DSKSYN);

	}

	return IRQ_HANDLED;

}

arch/m68k/amiga/cia.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask) 
	return old;

}



static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp)

static irqreturn_t cia_handler(int irq, void *dev_id)

{

	struct ciabase *base = (struct ciabase *)dev_id;

	int mach_irq;
@@ -93,7 +93,7 @@ static irqreturn_t cia_handler(int irq, void *dev_id, struct pt_regs *fp) 
	amiga_custom.intreq = base->int_mask;

	for (; ints; mach_irq++, ints >>= 1) {

		if (ints & 1)

			m68k_handle_int(mach_irq, fp);

			m68k_handle_int(mach_irq);

	}

	return IRQ_HANDLED;

}

arch/m68k/amiga/config.c

+2 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static char amiga_model_name[13] = "Amiga "; 


extern char m68k_debug_device[];



static void amiga_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));

static void amiga_sched_init(irqreturn_t (*handler)(int, void *));

/* amiga specific irq functions */

extern void amiga_init_IRQ (void);

static void amiga_get_model(char *model);
@@ -487,8 +487,7 @@ void __init config_amiga(void) 


static unsigned short jiffy_ticks;



static void __init amiga_sched_init(irqreturn_t (*timer_routine)(int, void *,

							  struct pt_regs *))

static void __init amiga_sched_init(irqreturn_t (*timer_routine)(int, void *))

{

	static struct resource sched_res = {

	    .name = "timer", .start = 0x00bfd400, .end = 0x00bfd5ff,

arch/m68k/apollo/config.c

+7 −7
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ u_long cpuctrl_physaddr; 
u_long timer_physaddr;

u_long apollo_model;



extern void dn_sched_init(irqreturn_t (*handler)(int,void *,struct pt_regs *));

extern void dn_sched_init(irqreturn_t (*handler)(int,void *));

extern void dn_init_IRQ(void);

extern unsigned long dn_gettimeoffset(void);

extern int dn_dummy_hwclk(int, struct rtc_time *);
@@ -38,7 +38,7 @@ extern irqreturn_t dn_process_int(int irq, struct pt_regs *fp); 
#ifdef CONFIG_HEARTBEAT

static void dn_heartbeat(int on);

#endif

static irqreturn_t dn_timer_int(int irq,void *, struct pt_regs *);

static irqreturn_t dn_timer_int(int irq,void *);

static void dn_get_model(char *model);

static const char *apollo_models[] = {

	[APOLLO_DN3000-APOLLO_DN3000] = "DN3000 (Otter)",
@@ -174,13 +174,13 @@ void config_apollo(void) { 


}



irqreturn_t dn_timer_int(int irq, void *dev_id, struct pt_regs *fp)

irqreturn_t dn_timer_int(int irq, void *dev_id)

{

	irqreturn_t (*timer_handler)(int, void *, struct pt_regs *) = dev_id;

	irqreturn_t (*timer_handler)(int, void *) = dev_id;



	volatile unsigned char x;



	timer_handler(irq, dev_id, fp);

	timer_handler(irq, dev_id);



	x=*(volatile unsigned char *)(timer+3);

	x=*(volatile unsigned char *)(timer+5);
@@ -188,8 +188,8 @@ irqreturn_t dn_timer_int(int irq, void *dev_id, struct pt_regs *fp) 
	return IRQ_HANDLED;

}



void dn_sched_init(irqreturn_t (*timer_routine)(int, void *, struct pt_regs *)) {



void dn_sched_init(irqreturn_t (*timer_routine)(int, void *))

{

	/* program timer 1 */

	*(volatile unsigned char *)(timer+3)=0x01;

	*(volatile unsigned char *)(timer+1)=0x40;

arch/m68k/apollo/dn_ints.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


void dn_process_int(unsigned int irq, struct pt_regs *fp)

{

	m68k_handle_int(irq, fp);

	__m68k_handle_int(irq, fp);



	*(volatile unsigned char *)(pica)=0x20;

	*(volatile unsigned char *)(picb)=0x20;