From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0141C432C0 for ; Fri, 22 Nov 2019 11:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8801920706 for ; Fri, 22 Nov 2019 11:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420453; bh=XRvnylUpGzfPdPpjbHa5Bu+gFEj6YjRPwqZH4SaSa+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oCPVUNJKJPjruy3HEZdpauLJVpIHbLBaWW/0yfFuUFMgjwjXZTEwrUwksabKs3z2h zGzBO+RH8adb8KYLG3wULTi7sWFdZqaU7m2KYpbYtFrn1Hbv+QR1+K6W9K75wEABiG lOtFZj6HZb37Mn4NiI5gfaDjLcYoQeqegPD+cgTM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731093AbfKVLAw (ORCPT ); Fri, 22 Nov 2019 06:00:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:53388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730440AbfKVLAv (ORCPT ); Fri, 22 Nov 2019 06:00:51 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C75EB20679; Fri, 22 Nov 2019 11:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420451; bh=XRvnylUpGzfPdPpjbHa5Bu+gFEj6YjRPwqZH4SaSa+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=quF1jZ8gPGmnLr3ofgliwNiaqIhQ1tjZcs7u+12hD8BxlQqbLGm2Sm4UM9WSx/fC3 6uXw4bdhhq682RxaZcADLPh+cQrMgj84/lFfXqM+IT97jINWZkFbbWDE1myzRwV0dD /LBO/K4FMU6GufN+/ICLKfdwYd/nQ6VPodNLibHo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Borislav Petkov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 4.19 110/220] cpu/SMT: State SMT is disabled even with nosmt and without "=force" Date: Fri, 22 Nov 2019 11:27:55 +0100 Message-Id: <20191122100920.676724471@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov [ Upstream commit d0e7d14455d41163126afecd0fcce935463cc512 ] When booting with "nosmt=force" a message is issued into dmesg to confirm that SMT has been force-disabled but such a message is not issued when only "nosmt" is on the kernel command line. Fix that. Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20181004172227.10094-1-bp@alien8.de Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/cpu.c b/kernel/cpu.c index 9bb57ce57d98d..8d6b8b5493f9f 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -375,6 +375,7 @@ void __init cpu_smt_disable(bool force) pr_info("SMT: Force disabled\n"); cpu_smt_control = CPU_SMT_FORCE_DISABLED; } else { + pr_info("SMT: disabled\n"); cpu_smt_control = CPU_SMT_DISABLED; } } -- 2.20.1