diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-08 09:59:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:32:36 -0400 |
commit | 5dcded1b0b4f1537bb6dff453fb805517756c94b (patch) | |
tree | 1cc2da28034a9ffd3555eb9e5372392b1518061a /arch/ia64/hp | |
parent | 2f116cbf369ec3148cef9821f6c7f2b8fb78a071 (diff) |
[PATCH] missed ia64 pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64/hp')
-rw-r--r-- | arch/ia64/hp/sim/simeth.c | 4 | ||||
-rw-r--r-- | arch/ia64/hp/sim/simserial.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index e1a1b11473e2..be769ef326a2 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c | |||
@@ -54,7 +54,7 @@ static int simeth_close(struct net_device *dev); | |||
54 | static int simeth_tx(struct sk_buff *skb, struct net_device *dev); | 54 | static int simeth_tx(struct sk_buff *skb, struct net_device *dev); |
55 | static int simeth_rx(struct net_device *dev); | 55 | static int simeth_rx(struct net_device *dev); |
56 | static struct net_device_stats *simeth_get_stats(struct net_device *dev); | 56 | static struct net_device_stats *simeth_get_stats(struct net_device *dev); |
57 | static irqreturn_t simeth_interrupt(int irq, void *dev_id, struct pt_regs * regs); | 57 | static irqreturn_t simeth_interrupt(int irq, void *dev_id); |
58 | static void set_multicast_list(struct net_device *dev); | 58 | static void set_multicast_list(struct net_device *dev); |
59 | static int simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr); | 59 | static int simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr); |
60 | 60 | ||
@@ -497,7 +497,7 @@ simeth_rx(struct net_device *dev) | |||
497 | * Interrupt handler (Yes, we can do it too !!!) | 497 | * Interrupt handler (Yes, we can do it too !!!) |
498 | */ | 498 | */ |
499 | static irqreturn_t | 499 | static irqreturn_t |
500 | simeth_interrupt(int irq, void *dev_id, struct pt_regs * regs) | 500 | simeth_interrupt(int irq, void *dev_id) |
501 | { | 501 | { |
502 | struct net_device *dev = dev_id; | 502 | struct net_device *dev = dev_id; |
503 | 503 | ||
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 246eb3d3757a..77819acaea9d 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
@@ -130,7 +130,7 @@ static void rs_start(struct tty_struct *tty) | |||
130 | #endif | 130 | #endif |
131 | } | 131 | } |
132 | 132 | ||
133 | static void receive_chars(struct tty_struct *tty, struct pt_regs *regs) | 133 | static void receive_chars(struct tty_struct *tty) |
134 | { | 134 | { |
135 | unsigned char ch; | 135 | unsigned char ch; |
136 | static unsigned char seen_esc = 0; | 136 | static unsigned char seen_esc = 0; |
@@ -152,7 +152,7 @@ static void receive_chars(struct tty_struct *tty, struct pt_regs *regs) | |||
152 | ch = ia64_ssc(0, 0, 0, 0, | 152 | ch = ia64_ssc(0, 0, 0, 0, |
153 | SSC_GETCHAR); | 153 | SSC_GETCHAR); |
154 | while (!ch); | 154 | while (!ch); |
155 | handle_sysrq(ch, regs, NULL); | 155 | handle_sysrq(ch, NULL); |
156 | } | 156 | } |
157 | #endif | 157 | #endif |
158 | seen_esc = 0; | 158 | seen_esc = 0; |
@@ -170,7 +170,7 @@ static void receive_chars(struct tty_struct *tty, struct pt_regs *regs) | |||
170 | /* | 170 | /* |
171 | * This is the serial driver's interrupt routine for a single port | 171 | * This is the serial driver's interrupt routine for a single port |
172 | */ | 172 | */ |
173 | static irqreturn_t rs_interrupt_single(int irq, void *dev_id, struct pt_regs * regs) | 173 | static irqreturn_t rs_interrupt_single(int irq, void *dev_id) |
174 | { | 174 | { |
175 | struct async_struct * info; | 175 | struct async_struct * info; |
176 | 176 | ||
@@ -187,7 +187,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id, struct pt_regs * r | |||
187 | * pretty simple in our case, because we only get interrupts | 187 | * pretty simple in our case, because we only get interrupts |
188 | * on inbound traffic | 188 | * on inbound traffic |
189 | */ | 189 | */ |
190 | receive_chars(info->tty, regs); | 190 | receive_chars(info->tty); |
191 | return IRQ_HANDLED; | 191 | return IRQ_HANDLED; |
192 | } | 192 | } |
193 | 193 | ||
@@ -714,7 +714,7 @@ startup(struct async_struct *info) | |||
714 | { | 714 | { |
715 | unsigned long flags; | 715 | unsigned long flags; |
716 | int retval=0; | 716 | int retval=0; |
717 | irqreturn_t (*handler)(int, void *, struct pt_regs *); | 717 | irqreturn_t (*handler)(int, void *); |
718 | struct serial_state *state= info->state; | 718 | struct serial_state *state= info->state; |
719 | unsigned long page; | 719 | unsigned long page; |
720 | 720 | ||