---

yaml --- r: 297587 b: refs/heads/master c: f153d01 h: refs/heads/master i: 297585: 9966be3 297583: a02866f v: v3
git-mirror · Mar 24, 2012 · 9f8aeef · 9f8aeef
1 parent 7c2372b
commit 9f8aeef
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git 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
@@ -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);