diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
| commit | f7901365aa48b20b25f8402e0fd1eea4ac6c55e7 (patch) | |
| tree | 4cab2d6b92324c06a457c43a5c8bac55581cdfb5 /arch/x86/include/asm/processor.h | |
| parent | cd1fe2006b62234455a91e428bad45331dc79250 (diff) | |
| parent | 701115b70ba8e8b20c6cfe689db4c1dd6af3ece9 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rt
Conflicts:
arch/x86/Kconfig
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 c124d6ab4bf9..86bccb4bd4dc 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -574,7 +574,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. |