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

Commit 913da64b authored by Alex Nixon's avatar Alex Nixon Committed by Ingo Molnar
Browse files

x86: build fix for !CONFIG_SMP 



Move reset_lazy_tlbstate into tlb_32.c, and define noop versions of
play_dead() in process_{32,64}.c when !CONFIG_SMP.

Signed-off-by: default avatarAlex Nixon <alex.nixon@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5ab6d815

arch/x86/kernel/cpu/common.c

+0 −7
Original line number Diff line number Diff line
@@ -714,10 +714,3 @@ void __cpuinit cpu_init(void) 
	mxcsr_feature_mask_init();

}

void reset_lazy_tlbstate(void)

{

	int cpu = raw_smp_processor_id();



	per_cpu(cpu_tlbstate, cpu).state = 0;

	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;

}

arch/x86/kernel/process_32.c

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ unsigned long thread_saved_pc(struct task_struct *tsk) 
	return ((unsigned long *)tsk->thread.sp)[3];

}



#ifndef CONFIG_SMP

static inline void play_dead(void)

{

	BUG();

}

#endif



/*

 * The idle thread. There's no useful work to be

 * done, so just try to conserve power and have a

arch/x86/kernel/process_64.c

+7 −0
Original line number Diff line number Diff line
@@ -85,6 +85,13 @@ void exit_idle(void) 
	__exit_idle();

}



#ifndef CONFIG_SMP

static inline void play_dead(void)

{

	BUG();

}

#endif



/*

 * The idle thread. There's no useful work to be

 * done, so just try to conserve power and have a

arch/x86/kernel/tlb_32.c

+8 −0
Original line number Diff line number Diff line
@@ -241,3 +241,11 @@ void flush_tlb_all(void) 
	on_each_cpu(do_flush_tlb_all, NULL, 1);

}



void reset_lazy_tlbstate(void)

{

	int cpu = raw_smp_processor_id();



	per_cpu(cpu_tlbstate, cpu).state = 0;

	per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm;

}

include/asm-x86/smp.h

+0 −9
Original line number Diff line number Diff line
@@ -222,14 +222,5 @@ static inline int hard_smp_processor_id(void) 


#endif /* CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_HOTPLUG_CPU

#ifdef CONFIG_X86_32

extern void reset_lazy_tlbstate(void);

#else

static inline void reset_lazy_tlbstate(void)

{ }

#endif /* CONFIG_X86_32 */

#endif



#endif /* __ASSEMBLY__ */

#endif