From 2f116cbf369ec3148cef9821f6c7f2b8fb78a071 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 8 Oct 2006 14:45:28 +0100 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- arch/alpha/kernel/err_titan.c | 4 ++-- arch/alpha/kernel/proto.h | 2 +- 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 2e6e6293332..febe71c6869 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 3fff8873419..daccd4b6d28 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 e8e8ec9c0f4..161d6915dc4 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); } -- 2.41.1