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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 18F0DC43331 for ; Tue, 12 Nov 2019 22:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E090E2196E for ; Tue, 12 Nov 2019 22:18:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alien8.de header.i=@alien8.de header.b="SDLBJ8HJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727063AbfKLWSf (ORCPT ); Tue, 12 Nov 2019 17:18:35 -0500 Received: from mail.skyhub.de ([5.9.137.197]:33080 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726896AbfKLWSf (ORCPT ); Tue, 12 Nov 2019 17:18:35 -0500 Received: from zn.tnic (p200300EC2F0F7D00610FFA679789BEE6.dip0.t-ipconnect.de [IPv6:2003:ec:2f0f:7d00:610f:fa67:9789:bee6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id F25371EC0CBD; Tue, 12 Nov 2019 23:18:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1573597114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sq6+SEUVeJWGjZHtXLuf1kFyBIboQ7zLeTG3FELODMM=; b=SDLBJ8HJcTFjsrjmxI1Ql0zLbgEt/4TMquT7uaSNZvCy/QrHA7StIlaLLLCbEmivOG2gUh CKl7M0tEGXL5VScINH12Wt4/ZZrTll3kruydrWO17UMhvDAhLfdHauSPQLJ0AGxgu2RnOF 1QZge4ZMZUEV2zuW+zx1/CvV2fnpjYs= From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH 2/2] x86/cpu/tsx: Define pr_fmt() Date: Tue, 12 Nov 2019 23:18:23 +0100 Message-Id: <20191112221823.19677-2-bp@alien8.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112221823.19677-1-bp@alien8.de> References: <20191112221823.19677-1-bp@alien8.de> MIME-Version: 1.0 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 ... so that all current and future pr_* statements in this file have the proper prefix. No functional changes. Signed-off-by: Borislav Petkov Cc: x86@kernel.org --- arch/x86/kernel/cpu/tsx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c index 3e20d322bc98..1674c8da003e 100644 --- a/arch/x86/kernel/cpu/tsx.c +++ b/arch/x86/kernel/cpu/tsx.c @@ -14,6 +14,9 @@ #include "cpu.h" +#undef pr_fmt +#define pr_fmt(fmt) "tsx: " fmt + enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED; void tsx_disable(void) @@ -99,7 +102,7 @@ void __init tsx_init(void) tsx_ctrl_state = x86_get_tsx_auto_mode(); } else { tsx_ctrl_state = TSX_CTRL_DISABLE; - pr_err("tsx: invalid option, defaulting to off\n"); + pr_err("invalid option, defaulting to off\n"); } } else { /* tsx= not provided */ -- 2.21.0