Merge commit 'a88f9e27498afaea615ad3e93af4f26df1f84987' into after-upstream-android

Conflicts:
	arch/arm/common/Kconfig
	arch/arm/mm/Makefile
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
	drivers/input/Kconfig
	drivers/input/Makefile
	drivers/power/Kconfig
	kernel/futex.c

1 files changed, 20 insertions, 0 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index d0a9b076a6fb..9dd31fafaa81 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -733,3 +733,23 @@ void init_cpu_online(const struct cpumask *src)
 {
 	cpumask_copy(to_cpumask(cpu_online_bits), src);
 }
+
+static ATOMIC_NOTIFIER_HEAD(idle_notifier);
+
+void idle_notifier_register(struct notifier_block *n)
+{
+	atomic_notifier_chain_register(&idle_notifier, n);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_register);
+
+void idle_notifier_unregister(struct notifier_block *n)
+{
+	atomic_notifier_chain_unregister(&idle_notifier, n);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_unregister);
+
+void idle_notifier_call_chain(unsigned long val)
+{
+	atomic_notifier_call_chain(&idle_notifier, val, NULL);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_call_chain);