---

yaml --- r: 248637 b: refs/heads/master c: f24444b h: refs/heads/master i: 248635: 95ef838 v: v3
git-mirror · May 23, 2011 · 6c215e1 · 6c215e1
1 parent a029e5a
commit 6c215e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ec2690758a5467f24beb301cca5098078073bba
+refs/heads/master: f24444b01bf6c51c300fd3ffc73423383d747882
diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h
@@ -174,7 +174,6 @@ enum  hrtimer_base_type {
  */
 struct hrtimer_cpu_base {
 	raw_spinlock_t			lock;
-	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
 #ifdef CONFIG_HIGH_RES_TIMERS
 	ktime_t				expires_next;
 	int				hres_active;
@@ -184,6 +183,7 @@ struct hrtimer_cpu_base {
 	unsigned long			nr_hangs;
 	ktime_t				max_hang_time;
 #endif
+	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
 };
 
 static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)