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

Commit f8096f92 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: separate cmpxchg8b checking from PAE checking 



.. allowing the former to be use in non-PAE kernels, too.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 492c2e47

arch/x86/Kconfig.cpu

+4 −0
Original line number Diff line number Diff line
@@ -399,6 +399,10 @@ config X86_TSC 
	def_bool y

	depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64



config X86_CMPXCHG64

	def_bool y

	depends on X86_PAE || X86_64



# this should be set for all -march=.. options where the compiler

# generates cmov.

config X86_CMOV

include/asm-x86/required-features.h

+5 −1
Original line number Diff line number Diff line
@@ -19,9 +19,13 @@ 


#if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)

# define NEED_PAE	(1<<(X86_FEATURE_PAE & 31))

# define NEED_CX8	(1<<(X86_FEATURE_CX8 & 31))

#else

# define NEED_PAE	0

#endif



#ifdef CONFIG_X86_CMPXCHG64

# define NEED_CX8	(1<<(X86_FEATURE_CX8 & 31))

#else

# define NEED_CX8	0

#endif