diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-28 16:50:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-28 16:50:42 -0500 |
| commit | d4928196fe9ec07d18139ba2735876b0c8aa738f (patch) | |
| tree | a999ee3f18b0d724b2adb15ec72854e7ade164fa /include/linux/init_task.h | |
| parent | bb04af0e2e5bcd8d1a5d7f7d5c704f7eb328f241 (diff) | |
| parent | febffd61816ef6d4f84189468c1d47f1df55921e (diff) | |
Merge branch 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block
* 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: kill some big inlines
cfq-iosched: relax IOPRIO_CLASS_IDLE restrictions
kernel: add CLONE_IO to specifically request sharing of IO contexts
io_context sharing - anticipatory changes
block: cfq: make the io contect sharing lockless
io_context sharing - cfq changes
io context sharing: preliminary support
ioprio: move io priority from task_struct to io_context
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 796019b22b6f..e6b3f7080679 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -137,7 +137,6 @@ extern struct group_info init_groups; | |||
| 137 | .time_slice = HZ, \ | 137 | .time_slice = HZ, \ |
| 138 | .nr_cpus_allowed = NR_CPUS, \ | 138 | .nr_cpus_allowed = NR_CPUS, \ |
| 139 | }, \ | 139 | }, \ |
| 140 | .ioprio = 0, \ | ||
| 141 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ | 140 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ |
| 142 | .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ | 141 | .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ |
| 143 | .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ | 142 | .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ |