diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-15 07:46:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-15 07:46:29 -0400 |
| commit | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (patch) | |
| tree | 53ccb1c2c14751fe69cf93102e76e97021f6df07 /include/linux/init_task.h | |
| parent | 4f962d4d65923d7b722192e729840cfb79af0a5a (diff) | |
| parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 9927a88674a..021d8e720c7 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -122,7 +122,7 @@ extern struct group_info init_groups; | |||
| 122 | .state = 0, \ | 122 | .state = 0, \ |
| 123 | .stack = &init_thread_info, \ | 123 | .stack = &init_thread_info, \ |
| 124 | .usage = ATOMIC_INIT(2), \ | 124 | .usage = ATOMIC_INIT(2), \ |
| 125 | .flags = 0, \ | 125 | .flags = PF_KTHREAD, \ |
| 126 | .lock_depth = -1, \ | 126 | .lock_depth = -1, \ |
| 127 | .prio = MAX_PRIO-20, \ | 127 | .prio = MAX_PRIO-20, \ |
| 128 | .static_prio = MAX_PRIO-20, \ | 128 | .static_prio = MAX_PRIO-20, \ |
| @@ -140,8 +140,8 @@ extern struct group_info init_groups; | |||
| 140 | .nr_cpus_allowed = NR_CPUS, \ | 140 | .nr_cpus_allowed = NR_CPUS, \ |
| 141 | }, \ | 141 | }, \ |
| 142 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ | 142 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ |
| 143 | .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ | 143 | .ptraced = LIST_HEAD_INIT(tsk.ptraced), \ |
| 144 | .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ | 144 | .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ |
| 145 | .real_parent = &tsk, \ | 145 | .real_parent = &tsk, \ |
| 146 | .parent = &tsk, \ | 146 | .parent = &tsk, \ |
| 147 | .children = LIST_HEAD_INIT(tsk.children), \ | 147 | .children = LIST_HEAD_INIT(tsk.children), \ |