diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
index e4f19970a82b..6b96e1f12a42 100644
--- a/include/asm-x86/processor_64.h
+++ b/include/asm-x86/processor_64.h
@@ -434,6 +434,10 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
 
 extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
 
+extern int force_mwait;
+
+extern void select_idle_routine(const struct cpuinfo_x86 *c);
+
 #define stack_current() \
 ({								\
 	struct thread_info *ti;					\
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index 9e3d51fd91a2..77b4177d17f5 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -67,8 +67,6 @@ extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long en
 
 extern void check_efer(void);
 
-extern void select_idle_routine(const struct cpuinfo_x86 *c);
-
 extern unsigned long table_start, table_end;
 
 extern int exception_trace;
@@ -80,8 +78,6 @@ extern int notsc_setup(char *);
 
 extern int gsi_irq_sharing(int gsi);
 
-extern int force_mwait;
-
 long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);
 
 #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))