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/sn | |
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/sn')
-rw-r--r-- | arch/ia64/sn/kernel/xpc_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c index 4d026f9dd98b..fa96dfc0e1aa 100644 --- a/arch/ia64/sn/kernel/xpc_main.c +++ b/arch/ia64/sn/kernel/xpc_main.c | |||
@@ -222,7 +222,7 @@ xpc_timeout_partition_disengage_request(unsigned long data) | |||
222 | * Notify the heartbeat check thread that an IRQ has been received. | 222 | * Notify the heartbeat check thread that an IRQ has been received. |
223 | */ | 223 | */ |
224 | static irqreturn_t | 224 | static irqreturn_t |
225 | xpc_act_IRQ_handler(int irq, void *dev_id, struct pt_regs *regs) | 225 | xpc_act_IRQ_handler(int irq, void *dev_id) |
226 | { | 226 | { |
227 | atomic_inc(&xpc_act_IRQ_rcvd); | 227 | atomic_inc(&xpc_act_IRQ_rcvd); |
228 | wake_up_interruptible(&xpc_act_IRQ_wq); | 228 | wake_up_interruptible(&xpc_act_IRQ_wq); |
@@ -607,12 +607,9 @@ xpc_activate_partition(struct xpc_partition *part) | |||
607 | * irq - Interrupt ReQuest number. NOT USED. | 607 | * irq - Interrupt ReQuest number. NOT USED. |
608 | * | 608 | * |
609 | * dev_id - partid of IPI's potential sender. | 609 | * dev_id - partid of IPI's potential sender. |
610 | * | ||
611 | * regs - processor's context before the processor entered | ||
612 | * interrupt code. NOT USED. | ||
613 | */ | 610 | */ |
614 | irqreturn_t | 611 | irqreturn_t |
615 | xpc_notify_IRQ_handler(int irq, void *dev_id, struct pt_regs *regs) | 612 | xpc_notify_IRQ_handler(int irq, void *dev_id) |
616 | { | 613 | { |
617 | partid_t partid = (partid_t) (u64) dev_id; | 614 | partid_t partid = (partid_t) (u64) dev_id; |
618 | struct xpc_partition *part = &xpc_partitions[partid]; | 615 | struct xpc_partition *part = &xpc_partitions[partid]; |