Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / idle.h

diff --git a/arch/x86/include/asm/idle.h b/arch/x86/include/asm/idle.h
index baa3f783d27dcb58c1de4fa66eb5f31deaecc872..38d87379e270596635ff569242c54ff71ad3ce69 100644 (file)
--- a/arch/x86/include/asm/idle.h
+++ b/arch/x86/include/asm/idle.h
@@ -1,15 +1,21 @@
-#ifndef ASM_X86__IDLE_H
-#define ASM_X86__IDLE_H
+#ifndef _ASM_X86_IDLE_H
+#define _ASM_X86_IDLE_H
 
 #define IDLE_START 1
 #define IDLE_END 2
 
 struct notifier_block;
 void idle_notifier_register(struct notifier_block *n);
+void idle_notifier_unregister(struct notifier_block *n);
 
+#ifdef CONFIG_X86_64
 void enter_idle(void);
 void exit_idle(void);
+#else /* !CONFIG_X86_64 */
+static inline void enter_idle(void) { }
+static inline void exit_idle(void) { }
+#endif /* CONFIG_X86_64 */
 
 void c1e_remove_cpu(int cpu);
 
-#endif /* ASM_X86__IDLE_H */
+#endif /* _ASM_X86_IDLE_H */