From 9e6ceaf8ddc380101bda7388b975776df94c5d61 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Wed, 20 Oct 2010 15:57:30 -0700
Subject: [PATCH] --- yaml --- r: 224020 b: refs/heads/master c:
 aaabe31c25a439b92cc281b14ca18b85bae7e7a6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4820588dfb25..6e52cef669a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd
+refs/heads/master: aaabe31c25a439b92cc281b14ca18b85bae7e7a6
diff --git a/trunk/include/linux/timer.h b/trunk/include/linux/timer.h
index f3dccdb44f95..1794674c1a52 100644
--- a/trunk/include/linux/timer.h
+++ b/trunk/include/linux/timer.h
@@ -54,6 +54,7 @@ extern struct tvec_base boot_tvec_bases;
 		.expires = (_expires),				\
 		.data = (_data),				\
 		.base = &boot_tvec_bases,			\
+		.slack = -1,					\
 		__TIMER_LOCKDEP_MAP_INITIALIZER(		\
 			__FILE__ ":" __stringify(__LINE__))	\
 	}