Commit 7d3ba9ce authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP: Undo next_timer_interrupt() fix for hrtimer

Undo patch bd9dac30 as a
better patch is now available.
parent d4877e58
...@@ -115,7 +115,6 @@ extern int hrtimer_try_to_cancel(struct hrtimer *timer); ...@@ -115,7 +115,6 @@ extern int hrtimer_try_to_cancel(struct hrtimer *timer);
/* Query timers: */ /* Query timers: */
extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer); extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer);
extern int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp); extern int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp);
extern int hrtimer_next_jiffie(unsigned long *next_jiffie);
static inline int hrtimer_active(const struct hrtimer *timer) static inline int hrtimer_active(const struct hrtimer *timer)
{ {
......
...@@ -505,79 +505,6 @@ ktime_t hrtimer_get_remaining(const struct hrtimer *timer) ...@@ -505,79 +505,6 @@ ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
return rem; return rem;
} }
#ifdef CONFIG_NO_IDLE_HZ
/**
* hrtimer_get_next - get next hrtimer to expire
*
* @bases: ktimer base array
*/
static inline struct hrtimer * hrtimer_get_next(struct hrtimer_base *bases)
{
unsigned long flags;
struct hrtimer *timer = NULL;
int i;
for (i = 0; i < MAX_HRTIMER_BASES; i++) {
struct hrtimer_base *base;
struct hrtimer *cur;
base = &bases[i];
spin_lock_irqsave(&base->lock, flags);
cur = rb_entry(base->first, struct hrtimer, node);
spin_unlock_irqrestore(&base->lock, flags);
if (cur == NULL)
continue;
if (timer == NULL || cur->expires.tv64 < timer->expires.tv64)
timer = cur;
}
return timer;
}
/**
* ktime_to_jiffies - converts ktime to jiffies
*
* @event: ktime event to be converted to jiffies
*
* Caller must take care xtime locking.
*/
static inline unsigned long ktime_to_jiffies(const ktime_t event)
{
ktime_t now, delta;
now = timespec_to_ktime(xtime);
delta = ktime_sub(event, now);
return jiffies + (((delta.tv64 * NSEC_CONVERSION) >>
(NSEC_JIFFIE_SC - SEC_JIFFIE_SC)) >> SEC_JIFFIE_SC);
}
/**
* hrtimer_next_jiffie - get next hrtimer event in jiffies
*
* Called from next_timer_interrupt() to get the next hrtimer event.
* Eventually we should change next_timer_interrupt() to return
* results in nanoseconds instead of jiffies. Caller must host xtime_lock.
*/
int hrtimer_next_jiffie(unsigned long *next_jiffie)
{
struct hrtimer_base *base = __get_cpu_var(hrtimer_bases);
struct hrtimer * timer;
timer = hrtimer_get_next(base);
if (timer == NULL)
return -EAGAIN;
*next_jiffie = ktime_to_jiffies(timer->expires);
return 0;
}
#endif
/** /**
* hrtimer_init - initialize a timer to the given clock * hrtimer_init - initialize a timer to the given clock
* *
......
...@@ -478,7 +478,6 @@ static inline void __run_timers(tvec_base_t *base) ...@@ -478,7 +478,6 @@ static inline void __run_timers(tvec_base_t *base)
} }
#ifdef CONFIG_NO_IDLE_HZ #ifdef CONFIG_NO_IDLE_HZ
/* /*
* Find out when the next timer event is due to happen. This * Find out when the next timer event is due to happen. This
* is used on S/390 to stop all activity when a cpus is idle. * is used on S/390 to stop all activity when a cpus is idle.
...@@ -490,15 +489,9 @@ unsigned long next_timer_interrupt(void) ...@@ -490,15 +489,9 @@ unsigned long next_timer_interrupt(void)
struct list_head *list; struct list_head *list;
struct timer_list *nte; struct timer_list *nte;
unsigned long expires; unsigned long expires;
unsigned long hr_expires = jiffies + 10 * HZ; /* Anything far ahead */
tvec_t *varray[4]; tvec_t *varray[4];
int i, j; int i, j;
/* Look for timer events in hrtimer. */
if ((hrtimer_next_jiffie(&hr_expires) == 0)
&& (time_before(hr_expires, jiffies + 2)))
return hr_expires;
base = &__get_cpu_var(tvec_bases); base = &__get_cpu_var(tvec_bases);
spin_lock(&base->t_base.lock); spin_lock(&base->t_base.lock);
expires = base->timer_jiffies + (LONG_MAX >> 1); expires = base->timer_jiffies + (LONG_MAX >> 1);
...@@ -549,10 +542,6 @@ found: ...@@ -549,10 +542,6 @@ found:
} }
} }
spin_unlock(&base->t_base.lock); spin_unlock(&base->t_base.lock);
if (time_before(hr_expires, expires))
expires = hr_expires;
return expires; return expires;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment