diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /include/linux/init_task.h | |
| parent | a375b15164dd9264f724ad941825e52c90145151 (diff) | |
| parent | 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index caa151fbebb7..689496bb6654 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -134,7 +134,6 @@ extern struct cred init_cred; | |||
| 134 | .stack = &init_thread_info, \ | 134 | .stack = &init_thread_info, \ |
| 135 | .usage = ATOMIC_INIT(2), \ | 135 | .usage = ATOMIC_INIT(2), \ |
| 136 | .flags = PF_KTHREAD, \ | 136 | .flags = PF_KTHREAD, \ |
| 137 | .lock_depth = -1, \ | ||
| 138 | .prio = MAX_PRIO-20, \ | 137 | .prio = MAX_PRIO-20, \ |
| 139 | .static_prio = MAX_PRIO-20, \ | 138 | .static_prio = MAX_PRIO-20, \ |
| 140 | .normal_prio = MAX_PRIO-20, \ | 139 | .normal_prio = MAX_PRIO-20, \ |