From 9f8aeef3f37a99ccff450f42aa4b287ba55d5331 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 4 Feb 2012 12:31:27 +0000
Subject: [PATCH] --- yaml --- r: 297587 b: refs/heads/master c:
 f153d017ab70d2954f5456278f3cbc39e6e060f3 h: refs/heads/master i:   297585:
 9966be303e345df61c39d9c7b15a9c7837a7aad7   297583:
 a02866f87acd91860a7317e0188480e81fba9a08 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/kernel/sched_clock.c | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 465e57b92b53..7e943d6590f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8211ca658728d03ba331de0276950289e52a1b0f
+refs/heads/master: f153d017ab70d2954f5456278f3cbc39e6e060f3
diff --git a/trunk/arch/arm/kernel/sched_clock.c b/trunk/arch/arm/kernel/sched_clock.c
index 5416c7c12528..27d186abbc06 100644
--- a/trunk/arch/arm/kernel/sched_clock.c
+++ b/trunk/arch/arm/kernel/sched_clock.c
@@ -10,6 +10,7 @@
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/syscore_ops.h>
 #include <linux/timer.h>
 
 #include <asm/sched_clock.h>
@@ -164,3 +165,20 @@ void __init sched_clock_postinit(void)
 
 	sched_clock_poll(sched_clock_timer.data);
 }
+
+static int sched_clock_suspend(void)
+{
+	sched_clock_poll(sched_clock_timer.data);
+	return 0;
+}
+
+static struct syscore_ops sched_clock_ops = {
+	.suspend = sched_clock_suspend,
+};
+
+static int __init sched_clock_syscore_init(void)
+{
+	register_syscore_ops(&sched_clock_ops);
+	return 0;
+}
+device_initcall(sched_clock_syscore_init);