| 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(-) |
| |
| --- a/drivers/usb/core/hcd.c |
| +++ b/drivers/usb/core/hcd.c |
| @@ -2217,7 +2217,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; |
| @@ -2226,7 +2226,7 @@ irqreturn_t usb_hcd_irq (int irq, void * |
| else |
| rc = IRQ_HANDLED; |
| |
| - local_irq_restore(flags); |
| + local_irq_restore_nort(flags); |
| return rc; |
| } |
| EXPORT_SYMBOL_GPL(usb_hcd_irq); |
