From 6c215e141c2a0d0fa3280695401187a38cdb2414 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 20 May 2011 13:02:58 +0200
Subject: [PATCH] --- yaml --- r: 248637 b: refs/heads/master c:
 f24444b01bf6c51c300fd3ffc73423383d747882 h: refs/heads/master i:   248635:
 95ef838aa4f72f4548e0ec3aa6a4f4c1818aa616 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hrtimer.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8a92dbd63f32..7fefc35e7c4e 100644
--- 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
index 925c8c01db7b..cc5f5f51db10 100644
--- 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)