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

Commit ada26d41 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6 

* 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6:
  Build fixes for struct pt_regs removal
parents d150ad7b be577a52

arch/parisc/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 


#undef PARISC_IRQ_CR16_COUNTS



extern irqreturn_t timer_interrupt(int, void *, struct pt_regs *);

extern irqreturn_t ipi_interrupt(int, void *, struct pt_regs *);

extern irqreturn_t timer_interrupt(int, void *);

extern irqreturn_t ipi_interrupt(int, void *);



#define EIEM_MASK(irq)       (1UL<<(CPU_IRQ_MAX - irq))
@@ -375,7 +375,7 @@ void do_cpu_irq_mask(struct pt_regs *regs) 
		goto set_out;

	}

#endif

	__do_IRQ(irq, regs);

	__do_IRQ(irq);



 out:

	irq_exit();

arch/parisc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
	/* gcc can optimize for "read-only" case with a local clocktick */

	unsigned long cpt = clocktick;



	profile_tick(CPU_PROFILING, regs);

	profile_tick(CPU_PROFILING);



	/* Initialize next_tick to the expected tick time. */

	next_tick = cpu_data[cpu].it_value;

drivers/input/keyboard/hil_kbd.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv) 
	kbd->dev->id.vendor	= PCI_VENDOR_ID_HP;

	kbd->dev->id.product	= 0x0001; /* TODO: get from kbd->rsc */

	kbd->dev->id.version	= 0x0100; /* TODO: get from kbd->rsc */

	kbd->dev->dev		= &serio->dev;

	kbd->dev->cdev.dev	= &serio->dev;



	for (i = 0; i < 128; i++) {

		set_bit(hil_kbd_set1[i], kbd->dev->keybit);

drivers/input/mouse/hil_ptr.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver) 
	ptr->dev->id.vendor	= PCI_VENDOR_ID_HP;

	ptr->dev->id.product	= 0x0001; /* TODO: get from ptr->rsc */

	ptr->dev->id.version	= 0x0100; /* TODO: get from ptr->rsc */

	ptr->dev->dev		= &serio->dev;

	ptr->dev->cdev.dev	= &serio->dev;



	input_register_device(ptr->dev);

	printk(KERN_INFO "input: %s (%s), ID: %d\n",

drivers/input/serio/gscps2.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static inline int gscps2_writeb_output(struct gscps2port *ps2port, u8 data) 


	/* make sure any received data is returned as fast as possible */

	/* this is important e.g. when we set the LEDs on the keyboard */

	gscps2_interrupt(0, NULL, NULL);

	gscps2_interrupt(0, NULL);



	return 1;

}
@@ -306,7 +306,7 @@ static int gscps2_open(struct serio *port) 
	/* enable it */

	gscps2_enable(ps2port, ENABLE);



	gscps2_interrupt(0, NULL, NULL);

	gscps2_interrupt(0, NULL);



	return 0;

}