aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-10-07 07:11:07 -0400
committerMatthew Wilcox <willy@parisc-linux.org>2006-10-07 07:11:07 -0400
commite11e30a063b515e95fb590f1558b5fea21273c63 (patch)
tree4f5aff98e2d14dbd3ded2ba20f791db3b2540815 /arch
parentada26d41e9ee1da31d11957b4452f4227a292e10 (diff)
[PARISC] Use set_irq_regs
Actually set the irq_regs pointer. Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/kernel/irq.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 2ece7c7939fe..b39c5b9aff46 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -347,12 +347,14 @@ static inline int eirr_to_irq(unsigned long eirr)
347/* ONLY called from entry.S:intr_extint() */ 347/* ONLY called from entry.S:intr_extint() */
348void do_cpu_irq_mask(struct pt_regs *regs) 348void do_cpu_irq_mask(struct pt_regs *regs)
349{ 349{
350 struct pt_regs *old_regs;
350 unsigned long eirr_val; 351 unsigned long eirr_val;
351 int irq, cpu = smp_processor_id(); 352 int irq, cpu = smp_processor_id();
352#ifdef CONFIG_SMP 353#ifdef CONFIG_SMP
353 cpumask_t dest; 354 cpumask_t dest;
354#endif 355#endif
355 356
357 old_regs = set_irq_regs(regs);
356 local_irq_disable(); 358 local_irq_disable();
357 irq_enter(); 359 irq_enter();
358 360
@@ -379,6 +381,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
379 381
380 out: 382 out:
381 irq_exit(); 383 irq_exit();
384 set_irq_regs(old_regs);
382 return; 385 return;
383 386
384 set_out: 387 set_out: