leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fixes for struct pt_regs removal

Browse Source 
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
This commit is contained in:
Matthew Wilcox 2006-10-06 20:47:23 -06:00 committed by Matthew Wilcox
parent e317c8ccaa
commit be577a5220
11 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/parisc/kernel/irq.c
View File

@ -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();

2
arch/parisc/kernel/time.c
View File

@ -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;

2
drivers/input/keyboard/hil_kbd.c
View File

@ -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);

2
drivers/input/mouse/hil_ptr.c
View File

@ -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",

4
drivers/input/serio/gscps2.c
View File

@ -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;
}

32
drivers/input/serio/hil_mlc.c
View File

@ -162,10 +162,10 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
if (did != (p & HIL_PKT_ADDR_MASK) >> 8) {
if (drv == NULL || drv->interrupt == NULL) goto skip;
drv->interrupt(serio, 0, 0, NULL);
drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0, NULL);
drv->interrupt(serio, HIL_CMD_POL + cnt, 0, NULL);
drv->interrupt(serio, 0, 0);
drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0);
drv->interrupt(serio, HIL_CMD_POL + cnt, 0);
skip:
did = (p & HIL_PKT_ADDR_MASK) >> 8;
serio = did ? mlc->serio[mlc->di_map[did-1]] : NULL;
@ -174,10 +174,10 @@ static void hil_mlc_send_polls(hil_mlc *mlc) {
}
cnt++; i++;
if (drv == NULL || drv->interrupt == NULL) continue;
drv->interrupt(serio, (p >> 24), 0, NULL);
drv->interrupt(serio, (p >> 16) & 0xff, 0, NULL);
drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0, NULL);
drv->interrupt(serio, p & 0xff, 0, NULL);
drv->interrupt(serio, (p >> 24), 0);
drv->interrupt(serio, (p >> 16) & 0xff, 0);
drv->interrupt(serio, (p >> 8) & ~HIL_PKT_ADDR_MASK, 0);
drv->interrupt(serio, p & 0xff, 0);
}
}
@ -780,16 +780,16 @@ static int hil_mlc_serio_write(struct serio *serio, unsigned char c) {
while ((last != idx) && (*last == 0)) last--;
while (idx != last) {
drv->interrupt(serio, 0, 0, NULL);
drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
drv->interrupt(serio, 0, 0, NULL);
drv->interrupt(serio, *idx, 0, NULL);
drv->interrupt(serio, 0, 0);
drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
drv->interrupt(serio, 0, 0);
drv->interrupt(serio, *idx, 0);
idx++;
}
drv->interrupt(serio, 0, 0, NULL);
drv->interrupt(serio, HIL_ERR_INT >> 16, 0, NULL);
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0, NULL);
drv->interrupt(serio, *idx, 0, NULL);
drv->interrupt(serio, 0, 0);
drv->interrupt(serio, HIL_ERR_INT >> 16, 0);
drv->interrupt(serio, HIL_PKT_CMD >> 8, 0);
drv->interrupt(serio, *idx, 0);
mlc->serio_oidx[map->didx] = 0;
mlc->serio_opacket[map->didx] = 0;

2
drivers/net/lasi_82596.c
View File

@ -1252,7 +1252,7 @@ static int __devinit i82596_probe(struct net_device *dev,
static void i596_poll_controller(struct net_device *dev)
{
disable_irq(dev->irq);
i596_interrupt(dev->irq, dev, NULL);
i596_interrupt(dev->irq, dev);
enable_irq(dev->irq);
}
#endif

2
drivers/parisc/dino.c
View File

@ -389,7 +389,7 @@ ilr_again:
int irq = dino_dev->global_irq[local_irq];
DBG(KERN_DEBUG "%s(%d, %p) mask 0x%x\n",
__FUNCTION__, irq, intr_dev, mask);
__do_IRQ(irq, regs);
__do_IRQ(irq);
mask &= ~(1 << local_irq);
} while (mask);

2
drivers/parisc/eisa.c
View File

@ -234,7 +234,7 @@ static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
}
spin_unlock_irqrestore(&eisa_irq_lock, flags);
__do_IRQ(irq, regs);
__do_IRQ(irq);
spin_lock_irqsave(&eisa_irq_lock, flags);
/* unmask */

2
drivers/serial/mux.c
View File

@ -230,7 +230,7 @@ static void mux_read(struct uart_port *port)
continue;
}
if (uart_handle_sysrq_char(port, data & 0xffu, NULL))
if (uart_handle_sysrq_char(port, data & 0xffu))
continue;
tty_insert_flip_char(tty, data & 0xFF, TTY_NORMAL);

1
include/asm-parisc/irq_regs.h Normal file
View File

@ -0,0 +1 @@
#include <asm-generic/irq_regs.h>