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 /include/linux/init_task.h | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index d87247d2641f..7f54ba942429 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -145,8 +145,8 @@ extern struct cred init_cred; | |||
| 145 | .group_leader = &tsk, \ | 145 | .group_leader = &tsk, \ |
| 146 | .real_cred = &init_cred, \ | 146 | .real_cred = &init_cred, \ |
| 147 | .cred = &init_cred, \ | 147 | .cred = &init_cred, \ |
| 148 | .cred_exec_mutex = \ | 148 | .cred_guard_mutex = \ |
| 149 | __MUTEX_INITIALIZER(tsk.cred_exec_mutex), \ | 149 | __MUTEX_INITIALIZER(tsk.cred_guard_mutex), \ |
| 150 | .comm = "swapper", \ | 150 | .comm = "swapper", \ |
| 151 | .thread = INIT_THREAD, \ | 151 | .thread = INIT_THREAD, \ |
| 152 | .fs = &init_fs, \ | 152 | .fs = &init_fs, \ |