From 761f32531648ef93649f0c4299f81d27253d3ef9 Mon Sep 17 00:00:00 2001
From: David Miller <davem@davemloft.net>
Date: Mon, 16 Jul 2007 17:17:44 -0700
Subject: [PATCH] --- yaml --- r: 60457 b: refs/heads/master c:
 7713a7d195c2e11d7ba6a973317da0af862d1264 h: refs/heads/master i:   60455:
 3df4f3e377bd3ab15a64ca319b8846040fddc7e3 v: v3

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

diff --git a/[refs] b/[refs]
index 77fe2e04c96e..70d970e28cd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29417b899a77aaba1c060f5e123db4f50006f58a
+refs/heads/master: 7713a7d195c2e11d7ba6a973317da0af862d1264
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) {