aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/hrtimer.h32
-rw-r--r--include/linux/smp.h5
2 files changed, 0 insertions, 37 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index d1be5d2cb8fc..05f6df1fdf5b 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -178,7 +178,6 @@ enum hrtimer_base_type {
178 * @nr_hangs: Total number of hrtimer interrupt hangs 178 * @nr_hangs: Total number of hrtimer interrupt hangs
179 * @max_hang_time: Maximum time spent in hrtimer_interrupt 179 * @max_hang_time: Maximum time spent in hrtimer_interrupt
180 * @clock_base: array of clock bases for this cpu 180 * @clock_base: array of clock bases for this cpu
181 * @to_pull: LITMUS^RT list of timers to be pulled on this cpu
182 */ 181 */
183struct hrtimer_cpu_base { 182struct hrtimer_cpu_base {
184 raw_spinlock_t lock; 183 raw_spinlock_t lock;
@@ -196,32 +195,8 @@ struct hrtimer_cpu_base {
196 ktime_t max_hang_time; 195 ktime_t max_hang_time;
197#endif 196#endif
198 struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; 197 struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
199 struct list_head to_pull;
200}; 198};
201 199
202#ifdef CONFIG_ARCH_HAS_SEND_PULL_TIMERS
203
204#define HRTIMER_START_ON_INACTIVE 0
205#define HRTIMER_START_ON_QUEUED 1
206
207/*
208 * struct hrtimer_start_on_info - save timer info on remote cpu
209 * @list: list of hrtimer_start_on_info on remote cpu (to_pull)
210 * @timer: timer to be triggered on remote cpu
211 * @time: time event
212 * @mode: timer mode
213 * @state: activity flag
214 */
215struct hrtimer_start_on_info {
216 struct list_head list;
217 struct hrtimer *timer;
218 ktime_t time;
219 enum hrtimer_mode mode;
220 atomic_t state;
221};
222
223#endif
224
225static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) 200static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
226{ 201{
227 timer->node.expires = time; 202 timer->node.expires = time;
@@ -387,13 +362,6 @@ __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
387 unsigned long delta_ns, 362 unsigned long delta_ns,
388 const enum hrtimer_mode mode, int wakeup); 363 const enum hrtimer_mode mode, int wakeup);
389 364
390#ifdef CONFIG_ARCH_HAS_SEND_PULL_TIMERS
391extern void hrtimer_start_on_info_init(struct hrtimer_start_on_info *info);
392extern int hrtimer_start_on(int cpu, struct hrtimer_start_on_info *info,
393 struct hrtimer *timer, ktime_t time,
394 const enum hrtimer_mode mode);
395#endif
396
397extern int hrtimer_cancel(struct hrtimer *timer); 365extern int hrtimer_cancel(struct hrtimer *timer);
398extern int hrtimer_try_to_cancel(struct hrtimer *timer); 366extern int hrtimer_try_to_cancel(struct hrtimer *timer);
399 367
diff --git a/include/linux/smp.h b/include/linux/smp.h
index dfc63fe33a63..c4414074bd88 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -103,11 +103,6 @@ void kick_all_cpus_sync(void);
103void wake_up_all_idle_cpus(void); 103void wake_up_all_idle_cpus(void);
104 104
105/* 105/*
106 * sends a 'pull timer' event to a remote CPU
107 */
108extern void smp_send_pull_timers(int cpu);
109
110/*
111 * Generic and arch helpers 106 * Generic and arch helpers
112 */ 107 */
113void __init call_function_init(void); 108void __init call_function_init(void);