diff --git a/[refs] b/[refs]
index b64b24c671a9..a59aea7a3535 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 980097b36074596c76c1367a9e7b70ec8583d55b
+refs/heads/master: 47c8c91b2d60006df22146effe79ac4cdafd9205
diff --git a/trunk/drivers/clocksource/arm_generic.c b/trunk/drivers/clocksource/arm_generic.c
index 6cd1b30e01ab..c210f4f1ecfd 100644
--- a/trunk/drivers/clocksource/arm_generic.c
+++ b/trunk/drivers/clocksource/arm_generic.c
@@ -224,7 +224,7 @@ int __init arm_generic_timer_init(void)
 	lpj_fine = DIV_ROUND_CLOSEST(arch_timer_rate, HZ);
 
 	/* Immediately configure the timer on the boot CPU */
-	arch_timer_setup(per_cpu_ptr(&arch_timer_evt, smp_processor_id()));
+	arch_timer_setup(this_cpu_ptr(&arch_timer_evt));
 
 	register_cpu_notifier(&arch_timer_cpu_nb);