diff options
-rw-r--r-- | include/linux/hrtimer.h | 2 | ||||
-rw-r--r-- | kernel/hrtimer.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 6d93dce61cbb..1b079bd29c35 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -145,7 +145,6 @@ struct hrtimer_sleeper { | |||
145 | * @first: pointer to the timer node which expires first | 145 | * @first: pointer to the timer node which expires first |
146 | * @resolution: the resolution of the clock, in nanoseconds | 146 | * @resolution: the resolution of the clock, in nanoseconds |
147 | * @get_time: function to retrieve the current time of the clock | 147 | * @get_time: function to retrieve the current time of the clock |
148 | * @get_softirq_time: function to retrieve the current time from the softirq | ||
149 | * @softirq_time: the time when running the hrtimer queue in the softirq | 148 | * @softirq_time: the time when running the hrtimer queue in the softirq |
150 | * @offset: offset of this clock to the monotonic base | 149 | * @offset: offset of this clock to the monotonic base |
151 | * @reprogram: function to reprogram the timer event | 150 | * @reprogram: function to reprogram the timer event |
@@ -157,7 +156,6 @@ struct hrtimer_clock_base { | |||
157 | struct rb_node *first; | 156 | struct rb_node *first; |
158 | ktime_t resolution; | 157 | ktime_t resolution; |
159 | ktime_t (*get_time)(void); | 158 | ktime_t (*get_time)(void); |
160 | ktime_t (*get_softirq_time)(void); | ||
161 | ktime_t softirq_time; | 159 | ktime_t softirq_time; |
162 | #ifdef CONFIG_HIGH_RES_TIMERS | 160 | #ifdef CONFIG_HIGH_RES_TIMERS |
163 | ktime_t offset; | 161 | ktime_t offset; |
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 03ea1378c43b..4d761d50c529 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1401,9 +1401,7 @@ void hrtimer_run_queues(void) | |||
1401 | if (!base->first) | 1401 | if (!base->first) |
1402 | continue; | 1402 | continue; |
1403 | 1403 | ||
1404 | if (base->get_softirq_time) | 1404 | if (gettime) { |
1405 | base->softirq_time = base->get_softirq_time(); | ||
1406 | else if (gettime) { | ||
1407 | hrtimer_get_softirq_time(cpu_base); | 1405 | hrtimer_get_softirq_time(cpu_base); |
1408 | gettime = 0; | 1406 | gettime = 0; |
1409 | } | 1407 | } |