From 1a86ef9bf0d118b00216d22f32bab878550a37a0 Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Wed, 20 Oct 2010 15:57:30 -0700
Subject: [PATCH] --- yaml --- r: 224019 b: refs/heads/master c:
 d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd h: refs/heads/master i:   224017:
 481ffa54960f86f29e8f0092175ec7112c58de8d   224015:
 76bb34ca15712a576252038b85ef99a8f49307a8 v: v3

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

diff --git a/[refs] b/[refs]
index 59104d037370..4820588dfb25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a386b5af8edda1c742ce9f77891e112eefffc005
+refs/heads/master: d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd
diff --git a/trunk/include/linux/timer.h b/trunk/include/linux/timer.h
index 38cf093ef62c..f3dccdb44f95 100644
--- a/trunk/include/linux/timer.h
+++ b/trunk/include/linux/timer.h
@@ -24,9 +24,9 @@ struct timer_list {
 	int slack;
 
 #ifdef CONFIG_TIMER_STATS
+	int start_pid;
 	void *start_site;
 	char start_comm[16];
-	int start_pid;
 #endif
 #ifdef CONFIG_LOCKDEP
 	struct lockdep_map lockdep_map;