diff options
| author | John Stultz <johnstul@us.ibm.com> | 2009-07-03 08:29:58 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-13 11:01:33 -0500 |
| commit | d3636e2033cf11718d8da3896cb4d30b0d91b674 (patch) | |
| tree | 7060f358db72eb7763b590a5f68a4b0ef2ebf258 /include | |
| parent | c4225114f3f31780ee99e9c7e6dae62fb1b03f08 (diff) | |
posix-timers: thread posix-cpu-timers on -rt
posix-cpu-timer code takes non -rt safe locks in hard irq
context. Move it to a thread.
[ 3.0 fixes from Peter Zijlstra <peterz@infradead.org> ]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/init_task.h | 7 | ||||
| -rw-r--r-- | include/linux/sched.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index e4baff5f7ff4..29334a50587f 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -132,6 +132,12 @@ extern struct cred init_cred; # define INIT_PERF_EVENTS(tsk) #endif +#ifdef CONFIG_PREEMPT_RT_BASE +# define INIT_TIMER_LIST .posix_timer_list = NULL, +#else +# define INIT_TIMER_LIST +#endif + #define INIT_TASK_COMM "swapper" /* @@ -186,6 +192,7 @@ extern struct cred init_cred; .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ .pi_lock = __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock), \ .timer_slack_ns = 50000, /* 50 usec default slack */ \ + INIT_TIMER_LIST \ .pids = { \ [PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \ [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \ diff --git a/include/linux/sched.h b/include/linux/sched.h index 5b63855db32b..b9975067d0e0 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1403,6 +1403,9 @@ struct task_struct { struct task_cputime cputime_expires; struct list_head cpu_timers[3]; +#ifdef CONFIG_PREEMPT_RT_BASE + struct task_struct *posix_timer_list; +#endif /* process credentials */ const struct cred __rcu *real_cred; /* objective and real subjective task |