diff options
| author | James Morris <jmorris@namei.org> | 2009-09-29 23:47:33 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-29 23:47:33 +0200 |
| commit | 1669b049db50fc7f1d4e694fb115a0f408c63fce (patch) | |
| tree | 9b3b90b5cbff9b8f30ecf0b2a44896ce8bef0c20 /security/selinux/hooks.c | |
| parent | TPM: increase default TPM buffer (diff) | |
| parent | Linux 2.6.32-rc1 (diff) | |
| download | linux-1669b049db50fc7f1d4e694fb115a0f408c63fce.tar.xz linux-1669b049db50fc7f1d4e694fb115a0f408c63fce.zip | |
Merge branch 'master' into next
Diffstat (limited to '')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 417f7c994522..bb230d5d7085 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2411,7 +2411,7 @@ static void selinux_bprm_committed_creds(struct linux_binprm *bprm) /* Wake up the parent if it is waiting so that it can recheck * wait permission to the new task SID. */ read_lock(&tasklist_lock); - wake_up_interruptible(¤t->real_parent->signal->wait_chldexit); + __wake_up_parent(current, current->real_parent); read_unlock(&tasklist_lock); } |