From 4bae74fb484a8f85308883af1885335889a24da8 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 12 Feb 2013 13:46:23 -0800
Subject: [PATCH] --- yaml --- r: 349703 b: refs/heads/master c:
 6e6668845fe593414a938b7726d6359b5570ac5a h: refs/heads/master i:   349701:
 2b1a4ae47bc0dd3c9b1ecf580d788dfeb29fc51e   349699:
 32f5c7595b606e788289d9e4fd1703b8429bbc58   349695:
 613abe4777cfc8c65d951d09dde29ffae9e8ff47 v: v3

---
 [refs]             | 2 +-
 trunk/kernel/pid.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9972a269f550..1e9910b71e63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ba902b5741859a04fdb90d675b9a87721a3fd59
+refs/heads/master: 6e6668845fe593414a938b7726d6359b5570ac5a
diff --git a/trunk/kernel/pid.c b/trunk/kernel/pid.c
index de9af600006f..f2c6a6825098 100644
--- a/trunk/kernel/pid.c
+++ b/trunk/kernel/pid.c
@@ -331,7 +331,7 @@ struct pid *alloc_pid(struct pid_namespace *ns)
 	return pid;
 
 out_unlock:
-	spin_unlock(&pidmap_lock);
+	spin_unlock_irq(&pidmap_lock);
 out_free:
 	while (++i <= ns->level)
 		free_pidmap(pid->numbers + i);