diff --git a/[refs] b/[refs]
index a2c67398b4b5..92dfcfb57185 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 275a89bdd3868af3008852594d2e169eaf69441b
+refs/heads/master: 0cd418ddb1ee88df7d16d5df06cb2da68eceb9e4
diff --git a/trunk/kernel/rcuclassic.c b/trunk/kernel/rcuclassic.c
index 3f6918966bda..743cf0550ff4 100644
--- a/trunk/kernel/rcuclassic.c
+++ b/trunk/kernel/rcuclassic.c
@@ -714,7 +714,7 @@ void rcu_check_callbacks(int cpu, int user)
 static void rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp,
 						struct rcu_data *rdp)
 {
-	long flags;
+	unsigned long flags;
 
 	spin_lock_irqsave(&rcp->lock, flags);
 	memset(rdp, 0, sizeof(*rdp));