alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs()
PATCH 4/4 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 <[email protected]>
--- 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(-)
arch/alpha/kernel/err_titan.c +2 -2
@@ -452,7 +452,7 @@ #endif /* CONFIG_VERBOSE_MCHECK */* 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 @@ #define PRIVATEER_HOTPLUG_INTERRUPT_MASK/* * Dispatch the interrupt(s). */ -titan_dispatch_irqs (irqmask,get_irq_regs ()); +titan_dispatch_irqs (irqmask);/* * Release the logout frame.
arch/alpha/kernel/proto.h +1 -1
@@ -177,7 +177,7 @@ extern void dik_show_regs(struct pt_regsextern 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 );
arch/alpha/kernel/sys_titan.c +1 -4
@@ -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_*/ 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_/* dispatch it */ alpha_mv.device_interrupt (vector); } -set_irq_regs (old_regs); }
Signature · 1 line
1.4.2.GIT