Message ID | tip-1c52d859cb2d417e7216d3e56bb7fea88444cec9@git.kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <xen-devel-bounces@lists.xen.org> 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 22CDE606DB for <patchwork-xen-devel@patchwork.kernel.org>; Mon, 19 Dec 2016 11:09:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CDE62844A for <patchwork-xen-devel@patchwork.kernel.org>; Mon, 19 Dec 2016 11:09:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1157B2847B; Mon, 19 Dec 2016 11:09:31 +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 5F1D52847A for <patchwork-xen-devel@patchwork.kernel.org>; Mon, 19 Dec 2016 11:09: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 <xen-devel-bounces@lists.xen.org>) id 1cIvm2-00031P-Oj; Mon, 19 Dec 2016 11:06:30 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <tipbot@zytor.com>) id 1cIvm1-00031J-KA for Xen-devel@lists.xen.org; Mon, 19 Dec 2016 11:06:29 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id FD/9E-25337-43FB7585; Mon, 19 Dec 2016 11:06:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCKsWRWlGSWpSXmKPExsVyrPMUl67J/vA Ig8fHJCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oyT87cyFRzkrZi4eiNjA+Nb7i5GLg4hgfmM Ek//7GWCcJoZJS6/WczcxcjJwSKgKtHyYQ87iC0hECOxZekKFhBbWEBTYvWvOawgNpuAiUTDi 6Ng9bwCnhJnHjUwggxiFnjIJHHqaw8bxNT3TBL3p69mA6niFAiTeLjtCBOILSQQKrFq5Q+wDS JA23bdWcoIsSFJYtraZrAN7ALmEitmXWGBuEJGYsWeTlaIXiWJiT8uMELYERJvZ15jgbhCUOL kzCdgNrOAvETz1tlA13EA2eoS6+cJQZjSEsv/cYBUCAgISPybdIEF5EwJgV5Gib17LkA97Cux vncJ6wRGiVlIps5CMnUWwtRZCFMXMLKsYtQoTi0qSy3SNbLUSyrKTM8oyU3MzNE1NDDTy00tL k5MT81JTCrWS87P3cQIjDsGINjBeGBR4CFGSQ4mJVHeKWtDIoT4kvJTKjMSizPii0pzUosPMc pwcChJ8N7eGx4hJFiUmp5akZaZA0wAMGkJDh4lEd7rIGne4oLE3OLMdIjUKUZjjr41i58ycUx 7BiSFWPLy81KlxHnN9wGVCoCUZpTmwQ2CJaZLjLJSwryMQKcJ8RSkFuVmlqDKv2IU52BUEuaV BpnCk5lXArfvFdApTECnLOwGO6UkESEl1cAoOS0zrfmH+unDrgZdipnFTRbzeGqmbTh16eSEK vUtb17aaUj/3b38SVNNQ8TGY8dCmirvrm379+NUXcXPSWEbOPXl+bwjX7Y2/1y4V+j46g0qdj 0Xt/3ndk/Y/bnU6aPApqzc4OpJEYU33qns5TQpkZ2iky2myFPs+f3TUeYjzp8yfM/fPxmkxFK ckWioxVxUnAgAAksAkkcDAAA= X-Env-Sender: tipbot@zytor.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1482145586!42319791!1 X-Originating-IP: [198.137.202.10] X-SpamReason: No, hits=1.0 required=7.0 tests=X_MAILER_SPAM X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60136 invoked from network); 19 Dec 2016 11:06:28 -0000 Received: from terminus.zytor.com (HELO terminus.zytor.com) (198.137.202.10) by server-10.tower-21.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 19 Dec 2016 11:06:28 -0000 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTP id uBJB3uRa027688; Mon, 19 Dec 2016 03:03:56 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id uBJB3ros027678; Mon, 19 Dec 2016 03:03:53 -0800 Date: Mon, 19 Dec 2016 03:03:53 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Andy Lutomirski <tipbot@zytor.com> Message-ID: <tip-1c52d859cb2d417e7216d3e56bb7fea88444cec9@git.kernel.org> In-Reply-To: <685bd083a7c036f7769510b6846315b17d6ba71f.1481307769.git.luto@kernel.org> References: <685bd083a7c036f7769510b6846315b17d6ba71f.1481307769.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Git-Commit-ID: 1c52d859cb2d417e7216d3e56bb7fea88444cec9 X-Mailer: tip-git-log-daemon Robot-ID: <tip-bot.git.kernel.org> Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from these emails MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk Cc: jgross@suse.com, gnomes@lxorguk.ukuu.org.uk, tglx@linutronix.de, hmh@hmh.eng.br, brgerst@gmail.com, peterz@infradead.org, andrew.cooper3@citrix.com, linux-kernel@vger.kernel.org, Xen-devel@lists.xen.org, bp@alien8.de, luto@kernel.org, hpa@zytor.com, boris.ostrovsky@oracle.com, tedheadster@gmail.com, mingo@kernel.org Subject: [Xen-devel] [tip:x86/urgent] 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 List-Id: Xen developer discussion <xen-devel.lists.xen.org> List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe> List-Post: <mailto:xen-devel@lists.xen.org> List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help> List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=subscribe> 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org> X-Virus-Scanned: ClamAV using ClamSMTP |
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.