From 5b86a72d6a73a11b26becfd118f4a35b006791e0 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 2 Nov 2011 13:38:46 -0700
Subject: [PATCH] --- yaml --- r: 273251 b: refs/heads/master c:
 46cbc1d3981ee753518fbf9198a14f71a9f6841e h: refs/heads/master i:   273249:
 1e7a87d6e9f8de8113ecaabadb26c71a8f868920   273247:
 3772410e69a4b590b540c14ac65d103eced428e3 v: v3

---
 [refs]          |  2 +-
 trunk/lib/idr.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5ce9aa07cc7f..0edb5cdfc443 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa6afca5bcaba8101f3ea09d5c3e4100b2b9f0e5
+refs/heads/master: 46cbc1d3981ee753518fbf9198a14f71a9f6841e
diff --git a/trunk/lib/idr.c b/trunk/lib/idr.c
index bbf211aea4eb..ed055b297c81 100644
--- a/trunk/lib/idr.c
+++ b/trunk/lib/idr.c
@@ -944,6 +944,7 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,
 {
 	int ret, id;
 	unsigned int max;
+	unsigned long flags;
 
 	BUG_ON((int)start < 0);
 	BUG_ON((int)end < 0);
@@ -959,7 +960,7 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,
 	if (!ida_pre_get(ida, gfp_mask))
 		return -ENOMEM;
 
-	spin_lock(&simple_ida_lock);
+	spin_lock_irqsave(&simple_ida_lock, flags);
 	ret = ida_get_new_above(ida, start, &id);
 	if (!ret) {
 		if (id > max) {
@@ -969,7 +970,7 @@ int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,
 			ret = id;
 		}
 	}
-	spin_unlock(&simple_ida_lock);
+	spin_unlock_irqrestore(&simple_ida_lock, flags);
 
 	if (unlikely(ret == -EAGAIN))
 		goto again;
@@ -985,10 +986,12 @@ EXPORT_SYMBOL(ida_simple_get);
  */
 void ida_simple_remove(struct ida *ida, unsigned int id)
 {
+	unsigned long flags;
+
 	BUG_ON((int)id < 0);
-	spin_lock(&simple_ida_lock);
+	spin_lock_irqsave(&simple_ida_lock, flags);
 	ida_remove(ida, id);
-	spin_unlock(&simple_ida_lock);
+	spin_unlock_irqrestore(&simple_ida_lock, flags);
 }
 EXPORT_SYMBOL(ida_simple_remove);