From af8da2fb0d3cee20e758c88d0e0617bca31c90f3 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 16 Jul 2007 17:33:17 -0700
Subject: [PATCH] --- yaml --- r: 60461 b: refs/heads/master c:
 7608a864e5211df1e3c1948e2719aec7c27b9333 h: refs/heads/master i:   60459:
 bbf53c5cf33720b18300c0114038417602d66f91 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7fe6173d15ba..29b4961b9104 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f798634d806615bee27d1b83479034087a02aa0f
+refs/heads/master: 7608a864e5211df1e3c1948e2719aec7c27b9333
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index 23c03f43e196..72d034258ba1 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -1406,7 +1406,7 @@ static void migrate_hrtimers(int cpu)
 static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
 					unsigned long action, void *hcpu)
 {
-	long cpu = (long)hcpu;
+	unsigned int cpu = (long)hcpu;
 
 	switch (action) {