diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:16:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:16:20 -0500 |
| commit | 45b86a96f17cb2900f291129b0e67287400e45b2 (patch) | |
| tree | f7968bf36e3947ee42251f7eebc6ea5f24aca202 /include/linux/sched.h | |
| parent | 072ba49838b42c873c496d72c91bb237914cf3b6 (diff) | |
| parent | 4143c5cb36331155a1823af8b3a8c761a59fed71 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
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 | /* |