37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From: Steven Rostedt <srostedt@redhat.com>
|
|
Date: Fri, 3 Jul 2009 08:44:26 -0500
|
|
Subject: usb: Use local_irq_*_nort() variants
|
|
|
|
[ tglx: Now that irqf_disabled is dead we should kill that ]
|
|
|
|
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
---
|
|
drivers/usb/core/hcd.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: linux-3.2/drivers/usb/core/hcd.c
|
|
===================================================================
|
|
--- linux-3.2.orig/drivers/usb/core/hcd.c
|
|
+++ linux-3.2/drivers/usb/core/hcd.c
|
|
@@ -2145,7 +2145,7 @@ irqreturn_t usb_hcd_irq (int irq, void *
|
|
* when the first handler doesn't use it. So let's just
|
|
* assume it's never used.
|
|
*/
|
|
- local_irq_save(flags);
|
|
+ local_irq_save_nort(flags);
|
|
|
|
if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd))) {
|
|
rc = IRQ_NONE;
|
|
@@ -2158,7 +2158,7 @@ irqreturn_t usb_hcd_irq (int irq, void *
|
|
rc = IRQ_HANDLED;
|
|
}
|
|
|
|
- local_irq_restore(flags);
|
|
+ local_irq_restore_nort(flags);
|
|
return rc;
|
|
}
|
|
EXPORT_SYMBOL_GPL(usb_hcd_irq);
|