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);