From d2ca936e708adf4efca1f006575a943a393e7830 Mon Sep 17 00:00:00 2001 From: Guangyu Sun Date: Thu, 4 Oct 2012 15:46:56 -0700 Subject: [PATCH] Revert "htrimer: fix kabi break." This reverts commit 4e0ad5132c7cdd5fe3a95470b31f4e5d689eed12. Signed-off-by: Guangyu Sun --- include/linux/hrtimer.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index c2012e3fb08e2..cc07d2777bbe6 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -178,7 +178,8 @@ enum hrtimer_base_type { */ struct hrtimer_cpu_base { raw_spinlock_t lock; - unsigned long active_bases; + unsigned int active_bases; + unsigned int clock_was_set; #ifdef CONFIG_HIGH_RES_TIMERS ktime_t expires_next; int hres_active; @@ -189,9 +190,6 @@ struct hrtimer_cpu_base { ktime_t max_hang_time; #endif struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; -#ifndef __GENKSYMS__ - unsigned int clock_was_set; -#endif }; static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) -- 2.50.1