From patchwork Fri Jan 13 13:23:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 43309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp272799wrt; Fri, 13 Jan 2023 05:37:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXtrlcIZNIgnx+F9gbZCKIuwLXsokx4At90KdG2LDoZkJf+DqJ8eubHIB1IFAOgx8aLKq92Z X-Received: by 2002:a05:6402:1801:b0:499:bf81:be6 with SMTP id g1-20020a056402180100b00499bf810be6mr13919965edy.37.1673617035897; Fri, 13 Jan 2023 05:37:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673617035; cv=none; d=google.com; s=arc-20160816; b=Py1kLznd60UaDKNaN5YOHNNMxB3HSLIkEpjLT/Xz7SMETpgnRO+jw7kpvEHjZZQor/ 1ymuKVYtdj3U+U4h9N+l24EG08nWFscAJrbX2ZjpkeZOLlyZsz7xXsP29N2uLvuHlKO0 HiKE2oLTaJHAOYyVWvAiVkMKyJu/4n9FLIYFMVAHJFbZAu3n3NaPrg3h6pTuIpJBkR5X zJg9pkDDf0hAkKoqzaOJXCZWv5Ciof/+hi8VHWrsoue40k3axgSgHbjE33nPXCTJt7EC t97TMCqdku+RAGArwn7xcismYu9slfJo4g/xdo1S+0Lq7kJYEOfheevx+bRXkLlVJSa2 bOWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=a3G1w5pdZU1FIx8tJLnQ2VJQUnMung6oi9cvwhN5A48=; b=xbmwDmtuNPzuvmjC0rSwuaRm32VyOmI6H1TpcilBG7vl6QAK4m1DGVJaRI8r7WjEGS i/subQMsKWzfq0CqA58OtUmR7Pdiph8gO0FIUctKc3UNr1DrpI71RELvBPgKI5BuZ3jJ PIPMzNA7+o/HGTza8eySTCGSUN6lQP5JSgfBABdVxCRm3zMVc1U4DVcYvhmqY5LCVIa+ HdLhVkeZM7zOhrC9x05OrTgClrHZqp8uUUC0/bPsIRCgsmkd6tjRRLoOTDJUdYN/E5L+ zd/Yo/C8/P77y5DoHQABZ1ZM5QJE0/j7a+F9x5oRoAFhigrhidyZwsdX1D3qDZgVbhb0 t/Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=HMFMdlMa; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dp15-20020a170906c14f00b007ae5b41855fsi21136934ejc.895.2023.01.13.05.36.51; Fri, 13 Jan 2023 05:37:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=HMFMdlMa; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241635AbjAMNcn (ORCPT + 99 others); Fri, 13 Jan 2023 08:32:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241135AbjAMNcB (ORCPT ); Fri, 13 Jan 2023 08:32:01 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65FC47F449; Fri, 13 Jan 2023 05:23:06 -0800 (PST) Date: Fri, 13 Jan 2023 13:23:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673616184; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a3G1w5pdZU1FIx8tJLnQ2VJQUnMung6oi9cvwhN5A48=; b=HMFMdlMa2JnD0nMC34RVW4wZRkR2Ndqv8a7RO+grDE8FTTe8VGUs5tkAJLX9G9w52Y8/pM jbEzrvWDSjf/tJMiDVy6u3497P8QQ7TjztBTXI8SHMKr6EpvpodKkxvKd/23hY42Cx3lrH uQvOndk3h+PmhBydP8JhSwADhFVD/12KcxQgI1a1BSniezWE74N1kXTHdEWMD+TZx+V+SQ PE06y5RQuXbUjxS8arzXcz8RQVilFyaEqMs23AdxXsgRjhwTIwD+QLW2r1yBjPXgtrnu+Z 1jV19eQ+XWHcL9Tp/B4CaKexXQOozmQnJjP0FpVCvqt/+JzBuojDJPRQARQa7g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673616184; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a3G1w5pdZU1FIx8tJLnQ2VJQUnMung6oi9cvwhN5A48=; b=kWI3zL47TdDPVvXXnuv/FWfYRl/n00/pbuuGCGCgCnG2d/1zrzTbyOteXv3Az77dD1enIS 1DkOU51SXun/AhDA== From: "tip-bot2 for Juergen Gross" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/cpu: Remove misleading comment Cc: Juergen Gross , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230113130126.1966-1-jgross@suse.com> References: <20230113130126.1966-1-jgross@suse.com> MIME-Version: 1.0 Message-ID: <167361618361.4906.17805909377526158491.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754914656914680869?= X-GMAIL-MSGID: =?utf-8?q?1754914656914680869?= The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: d55dcb7384b1234d3caf70c2f8199c4184502ff9 Gitweb: https://git.kernel.org/tip/d55dcb7384b1234d3caf70c2f8199c4184502ff9 Author: Juergen Gross AuthorDate: Fri, 13 Jan 2023 14:01:26 +01:00 Committer: Ingo Molnar CommitterDate: Fri, 13 Jan 2023 14:20:20 +01:00 x86/cpu: Remove misleading comment The comment of the "#endif" after setup_disable_pku() is wrong. As the related #ifdef is only a few lines above, just remove the comment. Signed-off-by: Juergen Gross Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230113130126.1966-1-jgross@suse.com --- arch/x86/kernel/cpu/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 9cfca3d..7670397 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -567,7 +567,7 @@ static __init int setup_disable_pku(char *arg) return 1; } __setup("nopku", setup_disable_pku); -#endif /* CONFIG_X86_64 */ +#endif #ifdef CONFIG_X86_KERNEL_IBT