From fb40884af09d1cf286081932f044c5b235b5e058 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 30 Jan 2008 13:30:16 +0100 Subject: [PATCH] --- yaml --- r: 79746 b: refs/heads/master c: fc36367211931cd503f050e4ceff5d9864cec817 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/processor_64.h | 4 ++++ trunk/include/asm-x86/proto.h | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 47bb58d5581c..0fdb7ca2f141 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c61b900ebb8ec5918ffd776ba1a61a5f022566d +refs/heads/master: fc36367211931cd503f050e4ceff5d9864cec817 diff --git a/trunk/include/asm-x86/processor_64.h b/trunk/include/asm-x86/processor_64.h index e4f19970a82b..6b96e1f12a42 100644 --- a/trunk/include/asm-x86/processor_64.h +++ b/trunk/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/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h index 9e3d51fd91a2..77b4177d17f5 100644 --- a/trunk/include/asm-x86/proto.h +++ b/trunk/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))