diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-27 11:30:05 +0100 |
commit | 34bf5d0ff54d03f0a8ed690d47efb806ee2fffcb (patch) | |
tree | 5465f999b2b067744220b66c89b75f0f10445d6e /arch/x86/include/asm/idle.h | |
parent | bd8b96dfc216eebc72950a6c40da8d3eca8667df (diff) | |
parent | 79a66b96c339626a3e4b226fefc0e45244cfe6ff (diff) |
Merge branch 'x86/core' into x86/cleanups
Diffstat (limited to 'arch/x86/include/asm/idle.h')
-rw-r--r-- | arch/x86/include/asm/idle.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/idle.h b/arch/x86/include/asm/idle.h index 44c89c3a23e..38d87379e27 100644 --- a/arch/x86/include/asm/idle.h +++ b/arch/x86/include/asm/idle.h @@ -8,8 +8,13 @@ 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); |