diff options
| author | James Morris <jmorris@namei.org> | 2009-06-10 21:03:14 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-10 21:03:14 -0400 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /kernel/cred.c | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/cred.c')
| -rw-r--r-- | kernel/cred.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 3a039189d707..1bb4d7e5d616 100644 --- a/kernel/cred.c +++ b/kernel/cred.c | |||
| @@ -167,7 +167,7 @@ EXPORT_SYMBOL(prepare_creds); | |||
| 167 | 167 | ||
| 168 | /* | 168 | /* |
| 169 | * Prepare credentials for current to perform an execve() | 169 | * Prepare credentials for current to perform an execve() |
| 170 | * - The caller must hold current->cred_exec_mutex | 170 | * - The caller must hold current->cred_guard_mutex |
| 171 | */ | 171 | */ |
| 172 | struct cred *prepare_exec_creds(void) | 172 | struct cred *prepare_exec_creds(void) |
| 173 | { | 173 | { |
| @@ -276,7 +276,7 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags) | |||
| 276 | struct cred *new; | 276 | struct cred *new; |
| 277 | int ret; | 277 | int ret; |
| 278 | 278 | ||
| 279 | mutex_init(&p->cred_exec_mutex); | 279 | mutex_init(&p->cred_guard_mutex); |
| 280 | 280 | ||
| 281 | if ( | 281 | if ( |
| 282 | #ifdef CONFIG_KEYS | 282 | #ifdef CONFIG_KEYS |