diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /kernel/cred.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel/cred.c')
| -rw-r--r-- | kernel/cred.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 9a3e22641fe7..6a1aa004e376 100644 --- a/kernel/cred.c +++ b/kernel/cred.c | |||
| @@ -325,7 +325,7 @@ EXPORT_SYMBOL(prepare_creds); | |||
| 325 | 325 | ||
| 326 | /* | 326 | /* |
| 327 | * Prepare credentials for current to perform an execve() | 327 | * Prepare credentials for current to perform an execve() |
| 328 | * - The caller must hold current->cred_guard_mutex | 328 | * - The caller must hold ->cred_guard_mutex |
| 329 | */ | 329 | */ |
| 330 | struct cred *prepare_exec_creds(void) | 330 | struct cred *prepare_exec_creds(void) |
| 331 | { | 331 | { |
| @@ -384,8 +384,6 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags) | |||
| 384 | struct cred *new; | 384 | struct cred *new; |
| 385 | int ret; | 385 | int ret; |
| 386 | 386 | ||
| 387 | mutex_init(&p->cred_guard_mutex); | ||
| 388 | |||
| 389 | if ( | 387 | if ( |
| 390 | #ifdef CONFIG_KEYS | 388 | #ifdef CONFIG_KEYS |
| 391 | !p->cred->thread_keyring && | 389 | !p->cred->thread_keyring && |
