aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/irq.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/kernel/irq.c')
-rw-r--r--arch/sparc/kernel/irq.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 5e9af3073acf..75b2240ad0f9 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -270,7 +270,7 @@ void free_irq(unsigned int irq, void *dev_id)
270 kfree(action); 270 kfree(action);
271 271
272 if (!sparc_irq[cpu_irq].action) 272 if (!sparc_irq[cpu_irq].action)
273 disable_irq(irq); 273 __disable_irq(irq);
274 274
275out_unlock: 275out_unlock:
276 spin_unlock_irqrestore(&irq_action_lock, flags); 276 spin_unlock_irqrestore(&irq_action_lock, flags);
@@ -466,7 +466,7 @@ int request_fast_irq(unsigned int irq,
466 466
467 sparc_irq[cpu_irq].action = action; 467 sparc_irq[cpu_irq].action = action;
468 468
469 enable_irq(irq); 469 __enable_irq(irq);
470 470
471 ret = 0; 471 ret = 0;
472out_unlock: 472out_unlock:
@@ -546,7 +546,7 @@ int request_irq(unsigned int irq,
546 546
547 *actionp = action; 547 *actionp = action;
548 548
549 enable_irq(irq); 549 __enable_irq(irq);
550 550
551 ret = 0; 551 ret = 0;
552out_unlock: 552out_unlock:
@@ -557,6 +557,25 @@ out:
557 557
558EXPORT_SYMBOL(request_irq); 558EXPORT_SYMBOL(request_irq);
559 559
560void disable_irq_nosync(unsigned int irq)
561{
562 return __disable_irq(irq);
563}
564EXPORT_SYMBOL(disable_irq_nosync);
565
566void disable_irq(unsigned int irq)
567{
568 return __disable_irq(irq);
569}
570EXPORT_SYMBOL(disable_irq);
571
572void enable_irq(unsigned int irq)
573{
574 return __enable_irq(irq);
575}
576
577EXPORT_SYMBOL(enable_irq);
578
560/* We really don't need these at all on the Sparc. We only have 579/* We really don't need these at all on the Sparc. We only have
561 * stubs here because they are exported to modules. 580 * stubs here because they are exported to modules.
562 */ 581 */