diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hrtimer.h | 9 | ||||
-rw-r--r-- | include/linux/sched.h | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 7a9398e19704..ecc8e2685e2b 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -217,6 +217,11 @@ static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer) | |||
217 | return timer->base->get_time(); | 217 | return timer->base->get_time(); |
218 | } | 218 | } |
219 | 219 | ||
220 | static inline int hrtimer_is_hres_active(struct hrtimer *timer) | ||
221 | { | ||
222 | return timer->base->cpu_base->hres_active; | ||
223 | } | ||
224 | |||
220 | /* | 225 | /* |
221 | * The resolution of the clocks. The resolution value is returned in | 226 | * The resolution of the clocks. The resolution value is returned in |
222 | * the clock_getres() system call to give application programmers an | 227 | * the clock_getres() system call to give application programmers an |
@@ -248,6 +253,10 @@ static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer) | |||
248 | return timer->base->softirq_time; | 253 | return timer->base->softirq_time; |
249 | } | 254 | } |
250 | 255 | ||
256 | static inline int hrtimer_is_hres_active(struct hrtimer *timer) | ||
257 | { | ||
258 | return 0; | ||
259 | } | ||
251 | #endif | 260 | #endif |
252 | 261 | ||
253 | extern ktime_t ktime_get(void); | 262 | extern ktime_t ktime_get(void); |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 7907845c2348..43e0339d65fc 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -257,6 +257,7 @@ extern void trap_init(void); | |||
257 | extern void account_process_tick(struct task_struct *task, int user); | 257 | extern void account_process_tick(struct task_struct *task, int user); |
258 | extern void update_process_times(int user); | 258 | extern void update_process_times(int user); |
259 | extern void scheduler_tick(void); | 259 | extern void scheduler_tick(void); |
260 | extern void hrtick_resched(void); | ||
260 | 261 | ||
261 | extern void sched_show_task(struct task_struct *p); | 262 | extern void sched_show_task(struct task_struct *p); |
262 | 263 | ||
@@ -849,7 +850,7 @@ struct sched_class { | |||
849 | #endif | 850 | #endif |
850 | 851 | ||
851 | void (*set_curr_task) (struct rq *rq); | 852 | void (*set_curr_task) (struct rq *rq); |
852 | void (*task_tick) (struct rq *rq, struct task_struct *p); | 853 | void (*task_tick) (struct rq *rq, struct task_struct *p, int queued); |
853 | void (*task_new) (struct rq *rq, struct task_struct *p); | 854 | void (*task_new) (struct rq *rq, struct task_struct *p); |
854 | void (*set_cpus_allowed)(struct task_struct *p, cpumask_t *newmask); | 855 | void (*set_cpus_allowed)(struct task_struct *p, cpumask_t *newmask); |
855 | 856 | ||