diff options
| author | Al Viro | 2006-10-08 14:45:28 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-08 12:32:36 -0700 |
| commit | 2f116cbf369ec3148cef9821f6c7f2b8fb78a071 (patch) | |
| tree | 29de6de6fe62e282f4cfdba081e313d9cb27698f /arch/alpha/kernel | |
| parent | 4fa1970a23bf8fc68e86b65a87c32556e20a6be6 (diff) | |
[PATCH] alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs()
titan_dispatch_irqs() always gets get_irq_regs() as argument; kill
the argument and collapse set_irq_regs() in body.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/err_titan.c | 4 | ||||
| -rw-r--r-- | arch/alpha/kernel/proto.h | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/sys_titan.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/arch/alpha/kernel/err_titan.c b/arch/alpha/kernel/err_titan.c index 2e6e62933327..febe71c6869f 100644 --- a/arch/alpha/kernel/err_titan.c +++ b/arch/alpha/kernel/err_titan.c @@ -452,7 +452,7 @@ titan_machine_check(u64 vector, u64 la_ptr) * machine checks to interrupts */ irqmask = tmchk->c_dirx & TITAN_MCHECK_INTERRUPT_MASK; - titan_dispatch_irqs(irqmask, get_irq_regs()); + titan_dispatch_irqs(irqmask); } @@ -746,7 +746,7 @@ privateer_machine_check(u64 vector, u64 la_ptr) /* * Dispatch the interrupt(s). */ - titan_dispatch_irqs(irqmask, get_irq_regs()); + titan_dispatch_irqs(irqmask); /* * Release the logout frame. diff --git a/arch/alpha/kernel/proto.h b/arch/alpha/kernel/proto.h index 3fff88734190..daccd4b6d28a 100644 --- a/arch/alpha/kernel/proto.h +++ b/arch/alpha/kernel/proto.h @@ -177,7 +177,7 @@ extern void dik_show_regs(struct pt_regs *regs, unsigned long *r9_15); extern void die_if_kernel(char *, struct pt_regs *, long, unsigned long *); /* sys_titan.c */ -extern void titan_dispatch_irqs(u64, struct pt_regs *); +extern void titan_dispatch_irqs(u64); /* ../mm/init.c */ extern void switch_to_system_map(void); diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index e8e8ec9c0f4e..161d6915dc49 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c @@ -243,9 +243,8 @@ titan_legacy_init_irq(void) } void -titan_dispatch_irqs(u64 mask, struct pt_regs *regs) +titan_dispatch_irqs(u64 mask) { - struct pt_regs *old_regs; unsigned long vector; /* @@ -253,7 +252,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs) */ mask &= titan_cpu_irq_affinity[smp_processor_id()]; - old_regs = set_irq_regs(regs); /* * Dispatch all requested interrupts */ @@ -267,7 +265,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs) /* dispatch it */ alpha_mv.device_interrupt(vector); } - set_irq_regs(old_regs); } |