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=unavailable 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 850CBC432C3 for ; Fri, 22 Nov 2019 10:52:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5991820656 for ; Fri, 22 Nov 2019 10:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419962; bh=Cn41HIe5V3zAox7aXOg0VUuj/MH8Wvj9LfKARyS6RhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yZypkCi3IwgcQ9+eI8Ul+iYFNa0TpJLLKZ69IteWCJIQgtnid8KwbPU8ZO0JgE2Vn DLuefyC/75oxyoEG/letnrFk8QDm00IhJ0jet8kbABIxlztA1dUjO47XH8R2aC/YTS 6EJvF/n/JNzUM6mSqx+atcG2PHNMJ9BQQDFt4Pvs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728092AbfKVKwh (ORCPT ); Fri, 22 Nov 2019 05:52:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:36300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727846AbfKVKwg (ORCPT ); Fri, 22 Nov 2019 05:52:36 -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 DC0EB2070E; Fri, 22 Nov 2019 10:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419956; bh=Cn41HIe5V3zAox7aXOg0VUuj/MH8Wvj9LfKARyS6RhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lij9UpF0ssfGpKSPfpfX0U2k1bMZ60zR2cjcLu0mWiWrcZrZYWK7Bg40SRUk4vzDI lIPrRExIe+ECgUqUVHSHeS8kTmbpCOs90YQ9uOTyDlATuPSuSz7Ygtxa+2Vv69vhdX fHdh1Xh+qLfkRK9proKhDyzbXCzDYeoBUkGWs3+c= 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.14 065/122] cpu/SMT: State SMT is disabled even with nosmt and without "=force" Date: Fri, 22 Nov 2019 11:28:38 +0100 Message-Id: <20191122100808.507564176@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100722.177052205@linuxfoundation.org> References: <20191122100722.177052205@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 96f970d77339a..49273130e4f1e 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -376,6 +376,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