diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-07 04:29:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-07 04:29:58 -0500 |
| commit | 258594a138f4ca9adf214f5272592d7f21def610 (patch) | |
| tree | d97ee71c997b0412f79b9ec4150cb52ce838fe13 /include/linux/sched.h | |
| parent | a87d091434ed2a34d647979ab12084139ee1fe41 (diff) | |
| parent | ca3273f9646694e0419cfb9d6c12deb1c9aff27c (diff) | |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index b483f39a7112..295b7c756ca6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1349,6 +1349,8 @@ struct task_struct { | |||
| 1349 | */ | 1349 | */ |
| 1350 | unsigned long timer_slack_ns; | 1350 | unsigned long timer_slack_ns; |
| 1351 | unsigned long default_timer_slack_ns; | 1351 | unsigned long default_timer_slack_ns; |
| 1352 | |||
| 1353 | struct list_head *scm_work_list; | ||
| 1352 | }; | 1354 | }; |
| 1353 | 1355 | ||
| 1354 | /* | 1356 | /* |