OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Al Viro 2006-10-08 14:45:28 +01:00 committed by Linus Torvalds
parent 4fa1970a23
commit 2f116cbf36
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/alpha/kernel/err_titan.c
View File

@ -452,7 +452,7 @@ titan_machine_check(u64 vector, u64 la_ptr)
* machine checks to interrupts * machine checks to interrupts
*/ */
irqmask = tmchk->c_dirx & TITAN_MCHECK_INTERRUPT_MASK; 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). * Dispatch the interrupt(s).
*/ */
titan_dispatch_irqs(irqmask, get_irq_regs()); titan_dispatch_irqs(irqmask);
/* /*
* Release the logout frame. * Release the logout frame.

2
arch/alpha/kernel/proto.h
View File

@ -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 *); extern void die_if_kernel(char *, struct pt_regs *, long, unsigned long *);
/* sys_titan.c */ /* sys_titan.c */
extern void titan_dispatch_irqs(u64, struct pt_regs *); extern void titan_dispatch_irqs(u64);
/* ../mm/init.c */ /* ../mm/init.c */
extern void switch_to_system_map(void); extern void switch_to_system_map(void);

5
arch/alpha/kernel/sys_titan.c
View File

@ -243,9 +243,8 @@ titan_legacy_init_irq(void)
} }
void void
titan_dispatch_irqs(u64 mask, struct pt_regs *regs) titan_dispatch_irqs(u64 mask)
{ {
struct pt_regs *old_regs;
unsigned long vector; unsigned long vector;
/* /*
@ -253,7 +252,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs)
*/ */
mask &= titan_cpu_irq_affinity[smp_processor_id()]; mask &= titan_cpu_irq_affinity[smp_processor_id()];
old_regs = set_irq_regs(regs);
/* /*
* Dispatch all requested interrupts * Dispatch all requested interrupts
*/ */
@ -267,7 +265,6 @@ titan_dispatch_irqs(u64 mask, struct pt_regs *regs)
/* dispatch it */ /* dispatch it */
alpha_mv.device_interrupt(vector); alpha_mv.device_interrupt(vector);
} }
set_irq_regs(old_regs);
} }