| From 307cb539a06cc3826ae8cb4e0a948f94ae6b4c61 Mon Sep 17 00:00:00 2001 |
| From: Sven-Thorsten Dietrich <sdietrich@novell.com> |
| Date: Fri, 3 Jul 2009 08:30:35 -0500 |
| Subject: [PATCH] infiniband: Mellanox IB driver patch use _nort() primitives |
| |
| commit 343c8c9a395840f5f16557e0ab7d058cfcec9c23 in tip. |
| |
| Fixes in_atomic stack-dump, when Mellanox module is loaded into the RT |
| Kernel. |
| |
| Michael S. Tsirkin <mst@dev.mellanox.co.il> sayeth: |
| "Basically, if you just make spin_lock_irqsave (and spin_lock_irq) not disable |
| interrupts for non-raw spinlocks, I think all of infiniband will be fine without |
| changes." |
| |
| Signed-off-by: Sven-Thorsten Dietrich <sven@thebigcorporation.com> |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 ++-- |
| 1 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c |
| index b166bb7..58f1568 100644 |
| --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c |
| +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c |
| @@ -797,7 +797,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) |
| |
| ipoib_mcast_stop_thread(dev, 0); |
| |
| - local_irq_save(flags); |
| + local_irq_save_nort(flags); |
| netif_addr_lock(dev); |
| spin_lock(&priv->lock); |
| |
| @@ -881,7 +881,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) |
| |
| spin_unlock(&priv->lock); |
| netif_addr_unlock(dev); |
| - local_irq_restore(flags); |
| + local_irq_restore_nort(flags); |
| |
| /* We have to cancel outside of the spinlock */ |
| list_for_each_entry_safe(mcast, tmcast, &remove_list, list) { |
| -- |
| 1.7.0.4 |
| |
