diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
| commit | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch) | |
| tree | a1d9511e488e19d41089ff0a736f6ce52a81c6e5 /include/asm-x86/processor.h | |
| parent | 93a0886e2368eafb9df5e2021fb185195cee88b2 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'include/asm-x86/processor.h')
| -rw-r--r-- | include/asm-x86/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index 7f7382704592..55402d2ab938 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h | |||
| @@ -727,6 +727,8 @@ extern int force_mwait; | |||
| 727 | extern void select_idle_routine(const struct cpuinfo_x86 *c); | 727 | extern void select_idle_routine(const struct cpuinfo_x86 *c); |
| 728 | 728 | ||
| 729 | extern unsigned long boot_option_idle_override; | 729 | extern unsigned long boot_option_idle_override; |
| 730 | extern unsigned long idle_halt; | ||
| 731 | extern unsigned long idle_nomwait; | ||
| 730 | 732 | ||
| 731 | extern void enable_sep_cpu(void); | 733 | extern void enable_sep_cpu(void); |
| 732 | extern int sysenter_setup(void); | 734 | extern int sysenter_setup(void); |