Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9781f39f authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Ingo Molnar
Browse files

x86: consolidate the definition of the force_mwait variable 



The force_mwait variable iss defined either in
arch/x86/kernel/cpu/amd.c or in arch/x86/kernel/setup_64.c, but it is
only initialized and used in arch/x86/kernel/process.c. This patch
moves the declaration to arch/x86/kernel/process.c.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: michael@free-electrons.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5b664cb2

arch/x86/kernel/cpu/amd.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
extern void vide(void);

__asm__(".align 4\nvide: ret");



int force_mwait __cpuinitdata;



static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)

{

	if (cpuid_eax(0x80000000) >= 0x80000007) {

arch/x86/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ unsigned long idle_nomwait; 
EXPORT_SYMBOL(idle_nomwait);



struct kmem_cache *task_xstate_cachep;

static int force_mwait __cpuinitdata;



int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)

{

include/asm-x86/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -722,8 +722,6 @@ 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);



extern unsigned long		boot_option_idle_override;