From patchwork Fri Dec 9 18:24:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 9468883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4589607D8 for ; Fri, 9 Dec 2016 18:26:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C0A72864C for ; Fri, 9 Dec 2016 18:26:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90AD228680; Fri, 9 Dec 2016 18:26:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2ECE52864C for ; Fri, 9 Dec 2016 18:26:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cFPqF-0003yh-FL; Fri, 09 Dec 2016 18:24:19 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cFPqD-0003yR-TW for Xen-devel@lists.xen.org; Fri, 09 Dec 2016 18:24:18 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id AB/64-28568-1D6FA485; Fri, 09 Dec 2016 18:24:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRWlGSWpSXmKPExsVybKJsh+6Fb14 RBgdOaFss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBl9r0+yFexmq/j//zN7A+N+1i5GLg4hgamM Eps2NLJDOLOYJCbPvsXWxcjBwSagLtHS6QtiiggISSy9WwdSwizQyCJxpaWDCSQuLBAv0TRPu 4uRk4NFQFViycLTrCA2r0CoxJXmbYwgtoSAnMSlbV+YQWxOAWOJRz/ng9lCAkYSq5fMxCsuIZ AhMa9nDiuE7SWx6MYlKFtN4uq5TcwTGAUWMDKsYtQoTi0qSy3SNTLQSyrKTM8oyU3MzNE1NDD Ty00tLk5MT81JTCrWS87P3cQIDCoGINjB+GtZwCFGSQ4mJVHeYiavCCG+pPyUyozE4oz4otKc 1OJDjDIcHEoSvOe+AuUEi1LTUyvSMnOA4Q2TluDgURLh/QSS5i0uSMwtzkyHSJ1iNOY48H7FU yaOBXNWPmUSYsnLz0uVEue9C1IqAFKaUZoHNwgWd5cYZaWEeRmBThPiKUgtys0sQZV/xSjOwa gkzLsRZApPZl4J3L5XQKcwAZ0y74Y7yCkliQgpqQZG5u+Fb2xktniw8zxfejNyfZ+JaS7vpYZ r1/tfmFRaa2dudLvQ9OXch21bVBcZeyrcOMa7vyv5m9ZOgUD7txfOSnWYrfub7bLwZ42y3y3Z w8GRXMeW9YkXxsiu/xR1P7Z31aa7U2emO51vjNl0cNW+o+tfRdRs3Wd3yjNv94TjMZMfLCltP fTrjBJLcUaioRZzUXEiADbO8JW2AgAA X-Env-Sender: luto@kernel.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1481307855!76709226!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60698 invoked from network); 9 Dec 2016 18:24:16 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-9.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 9 Dec 2016 18:24:16 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8A602011D; Fri, 9 Dec 2016 18:24:13 +0000 (UTC) Received: from localhost (c-71-202-137-17.hsd1.ca.comcast.net [71.202.137.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B7CC620173; Fri, 9 Dec 2016 18:24:12 +0000 (UTC) From: Andy Lutomirski To: x86@kernel.org Date: Fri, 9 Dec 2016 10:24:05 -0800 Message-Id: <685bd083a7c036f7769510b6846315b17d6ba71f.1481307769.git.luto@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: ClamAV using ClamSMTP Cc: Juergen Gross , One Thousand Gnomes , Andy Lutomirski , Peter Zijlstra , Brian Gerst , "linux-kernel@vger.kernel.org" , Matthew Whitehead , Borislav Petkov , Henrique de Moraes Holschuh , Andrew Cooper , Boris Ostrovsky , xen-devel Subject: [Xen-devel] [PATCH v4 1/4] x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 984a7bf17f6a..64fbc937d586 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -595,7 +595,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.