Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758331AbcLSLHO (ORCPT ); Mon, 19 Dec 2016 06:07:14 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58620 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753500AbcLSLHK (ORCPT ); Mon, 19 Dec 2016 06:07:10 -0500 Date: Mon, 19 Dec 2016 03:03:53 -0800 From: tip-bot for Andy Lutomirski Message-ID: Cc: boris.ostrovsky@oracle.com, jgross@suse.com, peterz@infradead.org, mingo@kernel.org, bp@alien8.de, tglx@linutronix.de, luto@kernel.org, Xen-devel@lists.xen.org, hmh@hmh.eng.br, andrew.cooper3@citrix.com, linux-kernel@vger.kernel.org, hpa@zytor.com, gnomes@lxorguk.ukuu.org.uk, tedheadster@gmail.com, brgerst@gmail.com Reply-To: brgerst@gmail.com, tedheadster@gmail.com, hpa@zytor.com, gnomes@lxorguk.ukuu.org.uk, Xen-devel@lists.xen.org, hmh@hmh.eng.br, andrew.cooper3@citrix.com, linux-kernel@vger.kernel.org, luto@kernel.org, bp@alien8.de, tglx@linutronix.de, peterz@infradead.org, jgross@suse.com, mingo@kernel.org, boris.ostrovsky@oracle.com In-Reply-To: <685bd083a7c036f7769510b6846315b17d6ba71f.1481307769.git.luto@kernel.org> References: <685bd083a7c036f7769510b6846315b17d6ba71f.1481307769.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels Git-Commit-ID: 1c52d859cb2d417e7216d3e56bb7fea88444cec9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1729 Lines: 44 Commit-ID: 1c52d859cb2d417e7216d3e56bb7fea88444cec9 Gitweb: http://git.kernel.org/tip/1c52d859cb2d417e7216d3e56bb7fea88444cec9 Author: Andy Lutomirski AuthorDate: Fri, 9 Dec 2016 10:24:05 -0800 Committer: Thomas Gleixner CommitDate: Mon, 19 Dec 2016 11:54:20 +0100 x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels We support various non-Intel CPUs that don't have the CPUID instruction, so the M486 test was wrong. For now, fix it with a big hammer: handle missing CPUID on all 32-bit CPUs. Reported-by: One Thousand Gnomes Signed-off-by: Andy Lutomirski Cc: Juergen Gross Cc: Peter Zijlstra Cc: Brian Gerst Cc: Matthew Whitehead Cc: Borislav Petkov Cc: Henrique de Moraes Holschuh Cc: Andrew Cooper Cc: Boris Ostrovsky Cc: xen-devel Link: http://lkml.kernel.org/r/685bd083a7c036f7769510b6846315b17d6ba71f.1481307769.git.luto@kernel.org Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 6aa741f..b934871 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -607,7 +607,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.