diff options
| author | Alex Nixon | 2008-09-03 15:30:23 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-05 17:44:08 +0200 |
| commit | 913da64b54b2b3bb212a59aba2e6f2b8294ca1fa (patch) | |
| tree | c7e715a2df32c8360bc568e274e4868640243e1b /include | |
| parent | Xen: fix cpu_hotplug build when !CONFIG_SMP (diff) | |
| download | kernel-qcow2-linux-913da64b54b2b3bb212a59aba2e6f2b8294ca1fa.tar.gz kernel-qcow2-linux-913da64b54b2b3bb212a59aba2e6f2b8294ca1fa.tar.xz kernel-qcow2-linux-913da64b54b2b3bb212a59aba2e6f2b8294ca1fa.zip | |
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: Alex Nixon <alex.nixon@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/smp.h | 9 | ||||
| -rw-r--r-- | include/asm-x86/tlbflush.h | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index 8bdaa4a25f05..30b5146cc436 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -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 diff --git a/include/asm-x86/tlbflush.h b/include/asm-x86/tlbflush.h index 35c76ceb9f40..0e7bbb549116 100644 --- a/include/asm-x86/tlbflush.h +++ b/include/asm-x86/tlbflush.h @@ -119,6 +119,10 @@ static inline void native_flush_tlb_others(const cpumask_t *cpumask, { } +static inline void reset_lazy_tlbstate(void) +{ +} + #else /* SMP */ #include <asm/smp.h> @@ -151,6 +155,12 @@ struct tlb_state { char __cacheline_padding[L1_CACHE_BYTES-8]; }; DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate); + +void reset_lazy_tlbstate(void); +#else +static inline void reset_lazy_tlbstate(void) +{ +} #endif #endif /* SMP */ |