diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:01:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:01:59 +0800 |
| commit | 4e5a5112cc603d1dcfe7247723e1c08b8ffbc7ff (patch) | |
| tree | 0eafc6ed77e008065ece3acd9ea83cc1a19a4122 /arch/x86/include/asm/processor.h | |
| parent | 05eda3c7aedbe06e9692a4a1ca511c6ab3d72de5 (diff) | |
| parent | 90aaf2f25609f99b63fcbed280716f80b4bc5f56 (diff) | |
Merge tag 'v3.18.93' into linux-linaro-lsk-v3.18lsk-v3.18-18.02
This is the 3.18.93 stable release
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 26d5e05a7def..f303d65bb202 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -669,7 +669,7 @@ static inline void sync_core(void) { int tmp; -#ifdef CONFIG_M486 +#ifdef CONFIG_X86_32 /* * Do a CPUID if available, otherwise do a jump. The jump * can conveniently enough be the jump around CPUID. |