44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 54158bb713cd22efe7d6c7e0be6e5b28e92ec1fd 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 083/287] infiniband: Mellanox IB driver patch use _nort()
|
|
primitives
|
|
|
|
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>
|
|
---
|
|
drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
|
|
index 80799c0..014589a8 100644
|
|
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
|
|
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
|
|
@@ -800,7 +800,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);
|
|
|
|
@@ -882,7 +882,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) {
|