From: Andrew Morton <akpm@osdl.org>

That would have caused much unpleasantness...

Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/timer.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN kernel/timer.c~round_jiffies-infrastructure-fix kernel/timer.c
--- a/kernel/timer.c~round_jiffies-infrastructure-fix
+++ a/kernel/timer.c
@@ -107,7 +107,7 @@ static DEFINE_PER_CPU(tvec_base_t *, tve
 unsigned long __round_jiffies(unsigned long j, int cpu)
 {
 	int rem;
-	int original  = j;
+	unsigned long original = j;
 
 	/*
 	 * We don't want all cpus firing their timers at once hitting the
@@ -216,7 +216,6 @@ unsigned long round_jiffies_relative(uns
 EXPORT_SYMBOL_GPL(round_jiffies_relative);
 
 
-
 static inline void set_running_timer(tvec_base_t *base,
 					struct timer_list *timer)
 {
_