From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226rYkgat6ShJEQQzdZXUIw0gzBZIWCs1zEi2+i6wxcWcxIQb+OnZ4LwWJ4GuQ0BF0budcmn ARC-Seal: i=1; a=rsa-sha256; t=1517256282; cv=none; d=google.com; s=arc-20160816; b=F1b7cUYdHSkk+KswrUNPcVK5PdlBmZHp1cu8n3m2lJQ9R2O/pnr2wc/ZqVxl+9zxJL NJfeZ3qXQsWfDDCXJkQ/J3/dqMqZjmwAZbsjcHBgEIv/15y42xlSo9S3CzDhw6sx2V5I jxQx5IRkLw+ijpMkV9t1mI8gq9NQF4fgx7vTlAQCPO+twpTYRVaGxEFG92hHTFXfqlti jnAZlX7LCUaaRGJ5jUxypwfnfnMzbC3NeYqS0NuXbyUQp+193rv1zHkrLbDA9xxxumEB 4kgwXzxYBzOYSBK0PIgHxEkeZVcUCYvUYyj0kfbdumJKddmU34SEbI2Dy2bEBEsFHZV8 fz/Q== 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=/TKnep7Sli+kbYH+8mPccuwFz7DIU8OnmigqLnuFkV0=; b=dXIO+TRYhr02kjeScXhY0I1MjsjqOiW6y+mmlmyHDTkjiS56VtTeQSGszNUy9uD06L wpXYEQvBDxz3qYDVpLF/O06ajMiLweTfPzeHEi7Dt00EYrfxmHLRs5EsrPH+TBFn6012 asy9jnjz/72aIpz/6Qa9SrFhUKTtFJGSKPejYIjXQlarQbd0Y2VVdg80G3bET2yEhnjI XvYRZ1mnlsIXy3E/o8ELApsfYRAfeHc422gGOTz5fyVgGYiMNFmKe69f4UTOkpODiz60 euqMWn7Jsb7laXlxSM4Qr7HX06FPlh+z0KpLItFoj746XtrdalUa5So3bl6k13f1mnCH zm6Q== 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 , "Zhang, Ning A" Subject: [PATCH 4.4 01/74] x86/asm/32: Make sync_core() handle missing CPUID on all 32-bit kernels Date: Mon, 29 Jan 2018 13:56:06 +0100 Message-Id: <20180129123847.578496255@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123847.507563674@linuxfoundation.org> References: <20180129123847.507563674@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?1590958522977394917?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-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 @@ -574,7 +574,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.