From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-4000417-1517256358-2-12689950748990240617 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517256355; b=rtzvX6h3iAb8A+fFdeSn3nNBUbZRtLrIZEoZswlVnoeFLUL oQVvyNQgbWOjEq7mjitLi3jgEgHs+nXNdToOC2oyA85VIVJxuUkDhicwRBeLh3bK Xnsdkl9c3/hxHUM4LZdjlFf3sCn8jmce69LtaWDPfllnLu4y6yOQIaYSu0+WwMQY dAoyyZtqC6+asBCnrPxExq1zscAqVcNBXkOoMXROOuPgrfF5GaxGQ0eKUXkkChMw LOVI0aEWV+lTYVASKdQDr6hMVPdV/2N1whzqWJ/sMQwgvvDSKfh5w7WRc+0E7Ra5 V4/7u2zUZuYTVZVUWAHXQXkwbvNAoztcVJr7MlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1517256355; bh=R9czW/zO7fRpczgNG+xNSrn39T y+bxMerV5a458tJqg=; b=gJFc6alP7hDwa0pSl7agH3m6BgtyfPttWuEkRCkrpe R65XKB4Cg8WFhxsFHEQvEU597MIVRUR3CkRnAUYiigJGR+t6hoxBM+SECmwbvOCs Qg4C6DJZPZSgROjymy2jyQlX1OCXrTI+cXUFj4vctRYIH6MUCll8IkTF5KXltF5P M+od/pOGodC+rU+sKEosAt/Vtl4r/WNsM3kX8nV7tzZjJeCk1K238nH5XZtHp2+O RgbFPjiCCZgwo4fj5E93gMIQUWPBW7TI4hV0sTGM5dpP+xOGyzrWAGPCCmPC/o7y Q1tjRSO5GwdzgGvD/d8A7VscjpLRm0M0PJTUcXC9wtcg== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbeA2UFv (ORCPT ); Mon, 29 Jan 2018 15:05:51 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:46694 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752115AbeA2UFu (ORCPT ); Mon, 29 Jan 2018 15:05:50 -0500 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 , "Zhang, Ning A" Subject: [PATCH 4.9 01/66] x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels Date: Mon, 29 Jan 2018 13:56:25 +0100 Message-Id: <20180129123839.913605720@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123839.842860149@linuxfoundation.org> References: <20180129123839.842860149@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-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 Cc: "Zhang, Ning A" 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 @@ -596,7 +596,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.