From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227FCvGCdobc2LrKBtoL0jRBRT7Sv1kdBnIpTmkAFWcVqWiJT8l/nVZVkfnk2W4girNoMTBu ARC-Seal: i=1; a=rsa-sha256; t=1517256268; cv=none; d=google.com; s=arc-20160816; b=IWb9nHFKIGeuWwJQJusH1ZMviTR6Z5M8H0qwgfOfNNTQA1jM7Se6iMo5TwlTtndU+F hsko4muTRpiJkI4oCqJg7bg+GvcfbVgFv4MfANd4NCc3LUcBBJ8MbZ5y6BVZx+cfpFHf 9pIocVBOPUDe0LJ+bDV7DLsyHOb8fzMGXhCTE+BJyueoDNJukT4tMUymVuD1OewnKcxH KNnTHREKk0H6sLFKsv8DyovJN69OaOc+PCSQyGb1qcsb+jRNCKCxitr5Sv+KuFY6TOSq mU0a+eKoos906EbK57FtjFefBybuur0hB93VAlsOhW10otRer0ggZUhMhDv7ssJGE9Ko lz3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=7wsY11yg5iSqtc/SNOj9Asej/cKP3/QC0/iOIigaFhk=; b=WZ1CYqUlUVHNRGxOizTAg3hsoQs3oISsUcL7CvZv/PGQPIQMwiVgaha3vKHssYoAV7 nI/aKa5vc1x4x4/5xd1w2STkuyvr+1xlnL0JoGQXOokL3INQunSK7uaAIr8yFLHjrz8n INwDz+4veD/CsG4WmD5XOw7Pnt/UKiwiU9hkEgyMKZnV/ZM5K/yct2eWwD/w+OKNRsEq cXTbVJs8OrXTHzOqXRVfEIUW+QmpEUn1FT5VAKbN6qA28pGa/kZh5ylYWKYTkO1G4Sa7 9anS2YwOMV6BHKoWrUBpd4wQjwC5+qZazot+Ja+TAriXNzNFjggcf0UT7L5x9GVUOoJb 2sUA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, One Thousand Gnomes , Andy Lutomirski , Juergen Gross , Peter Zijlstra , Brian Gerst , Matthew Whitehead , Borislav Petkov , Henrique de Moraes Holschuh , Andrew Cooper , Boris Ostrovsky , xen-devel , Thomas Gleixner Subject: [PATCH 3.18 20/52] x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels Date: Mon, 29 Jan 2018 13:56:38 +0100 Message-Id: <20180129123629.080490214@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958508885703059?= X-GMAIL-MSGID: =?utf-8?q?1590958508885703059?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Lutomirski commit 1c52d859cb2d417e7216d3e56bb7fea88444cec9 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 3.18 20/52] x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels Date: Mon, 29 Jan 2018 13:56:38 +0100 Message-ID: <20180129123629.080490214@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180129123628.168904217@linuxfoundation.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org Cc: Juergen Gross , One Thousand Gnomes , Henrique de Moraes Holschuh , Peter Zijlstra , Greg Kroah-Hartman , stable@vger.kernel.org, Matthew Whitehead , Andrew Cooper , Borislav Petkov , Andy Lutomirski , Brian Gerst , Boris Ostrovsky , xen-devel , Thomas Gleixner List-Id: xen-devel@lists.xenproject.org My4xOC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBBbmR5IEx1dG9t aXJza2kgPGx1dG9Aa2VybmVsLm9yZz4KCmNvbW1pdCAxYzUyZDg1OWNiMmQ0MTdlNzIxNmQzZTU2 YmI3ZmVhODg0NDRjZWM5IHVwc3RyZWFtLgoKV2Ugc3VwcG9ydCB2YXJpb3VzIG5vbi1JbnRlbCBD UFVzIHRoYXQgZG9uJ3QgaGF2ZSB0aGUgQ1BVSUQKaW5zdHJ1Y3Rpb24sIHNvIHRoZSBNNDg2IHRl c3Qgd2FzIHdyb25nLiAgRm9yIG5vdywgZml4IGl0IHdpdGggYSBiaWcKaGFtbWVyOiBoYW5kbGUg bWlzc2luZyBDUFVJRCBvbiBhbGwgMzItYml0IENQVXMuCgpSZXBvcnRlZC1ieTogT25lIFRob3Vz YW5kIEdub21lcyA8Z25vbWVzQGx4b3JndWsudWt1dS5vcmcudWs+ClNpZ25lZC1vZmYtYnk6IEFu ZHkgTHV0b21pcnNraSA8bHV0b0BrZXJuZWwub3JnPgpDYzogSnVlcmdlbiBHcm9zcyA8amdyb3Nz QHN1c2UuY29tPgpDYzogUGV0ZXIgWmlqbHN0cmEgPHBldGVyekBpbmZyYWRlYWQub3JnPgpDYzog QnJpYW4gR2Vyc3QgPGJyZ2Vyc3RAZ21haWwuY29tPgpDYzogTWF0dGhldyBXaGl0ZWhlYWQgPHRl ZGhlYWRzdGVyQGdtYWlsLmNvbT4KQ2M6IEJvcmlzbGF2IFBldGtvdiA8YnBAYWxpZW44LmRlPgpD YzogSGVucmlxdWUgZGUgTW9yYWVzIEhvbHNjaHVoIDxobWhAaG1oLmVuZy5icj4KQ2M6IEFuZHJl dyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+CkNjOiBCb3JpcyBPc3Ryb3Zza3kg PGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgpDYzogeGVuLWRldmVsIDxYZW4tZGV2ZWxAbGlz dHMueGVuLm9yZz4KTGluazogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzY4NWJkMDgzYTdjMDM2 Zjc3Njk1MTBiNjg0NjMxNWIxN2Q2YmE3MWYuMTQ4MTMwNzc2OS5naXQubHV0b0BrZXJuZWwub3Jn ClNpZ25lZC1vZmYtYnk6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPgpTaWdu ZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3Jn PgoKLS0tCiBhcmNoL3g4Ni9pbmNsdWRlL2FzbS9wcm9jZXNzb3IuaCB8ICAgIDIgKy0KIDEgZmls ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKLS0tIGEvYXJjaC94ODYv aW5jbHVkZS9hc20vcHJvY2Vzc29yLmgKKysrIGIvYXJjaC94ODYvaW5jbHVkZS9hc20vcHJvY2Vz c29yLmgKQEAgLTY2OSw3ICs2NjksNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgc3luY19jb3JlKHZv aWQpCiB7CiAJaW50IHRtcDsKIAotI2lmZGVmIENPTkZJR19NNDg2CisjaWZkZWYgQ09ORklHX1g4 Nl8zMgogCS8qCiAJICogRG8gYSBDUFVJRCBpZiBhdmFpbGFibGUsIG90aGVyd2lzZSBkbyBhIGp1 bXAuICBUaGUganVtcAogCSAqIGNhbiBjb252ZW5pZW50bHkgZW5vdWdoIGJlIHRoZSBqdW1wIGFy b3VuZCBDUFVJRC4KCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5v cmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZl bA==