From patchwork Tue Oct 3 09:33:53 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: 147791 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1961823vqb; Tue, 3 Oct 2023 02:34:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrWIhsg6PeJyJ1FefkxXvDR2jRazM/dOI4p58x1jhfGxc9CN33ZdLM7cfRB3rCSyP1KOAy X-Received: by 2002:a17:90b:4414:b0:274:cf7e:f11c with SMTP id hx20-20020a17090b441400b00274cf7ef11cmr3383110pjb.19.1696325657119; Tue, 03 Oct 2023 02:34:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696325657; cv=none; d=google.com; s=arc-20160816; b=h6AauNg8IbrZaU8OYfhPOO7LP8nMGydtPr9GkYmp/xyQ6HKNKb553yYmkGkAOHD5cd Mf1ELAlZwt/XKpW/yha3PHDlrD2o8eQpNN8acxrBPWNewTPDAIZXFjNwSxnHlq9xVyAP q35v6BJRg2YEr/CX/tADmkBxxKIM7MMboIzegtjDwmC2jIUGBSjET10tKJgVS4cOQfSq sOPlgvMbAIojaFGyxI/S+yIceqVDQZol5UiX5uKPukO9bxTAxyzslHVHEtBtgs8StnEK PV1ecl7ANixa/SkMZN47+lIHJyuGDmrocOlNo5xB2LnYNBM1ArdzN/3fSuXjwsaxqsUg Cf6g== 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=kFjy5OAkqj+RcMJ8GorPj2rGPTj6R6wFhYpPtVDM/ig=; fh=EJ3ldraINebT+shsWZdLHdSiuGLmW28h95aOW4drlxo=; b=Bcbjz8WH89/UA/qjgUgWycv3UD0ZriOTUl8z0Rf4aKRU4Dwl7Wo/896bT5lN85wc9q L6nsXilcQQDzkuolKfHpfNtWtOp1/xC7UacqlQUgl8ENv53PjRJg+0b/bh+JLfKoQdk+ WnBvvzF7OE+kYIzLmVnZ/WiwtOS/bramXeJ2vdsSgHfx4072UAqKx2rHFn8NqudkYoKo h4BvD1h43YtHnWZdwxNTfSo04Vn2dnRG4n7xTn6IxFNY7ywFg/42Ma56acUvDtXaq3XW dAZsjDD+HhOZhywWGMIo0TR8Udsz+xiju+IPGv2b+15UsOmjciNlrhpNqbsEfAQpCxeZ E+Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="MB1c/FrR"; dkim=neutral (no key) header.i=@linutronix.de header.b=sqow5UEu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id lk12-20020a17090b33cc00b002791b907f0csi7856015pjb.121.2023.10.03.02.34.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 02:34:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="MB1c/FrR"; dkim=neutral (no key) header.i=@linutronix.de header.b=sqow5UEu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id A75F9810499E; Tue, 3 Oct 2023 02:34:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231797AbjJCJeB (ORCPT + 18 others); Tue, 3 Oct 2023 05:34:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231199AbjJCJeA (ORCPT ); Tue, 3 Oct 2023 05:34:00 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA83B90; Tue, 3 Oct 2023 02:33:56 -0700 (PDT) Date: Tue, 03 Oct 2023 09:33:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696325634; 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=kFjy5OAkqj+RcMJ8GorPj2rGPTj6R6wFhYpPtVDM/ig=; b=MB1c/FrRYTpoNm8LHOYN1vTZN/22oh39zopdQ3MTBWz8FnZsB6L3ZejKDoQKnhoRty7VIG AqHgTHIyxgKEqSYGueCa81vqG0SNWok27V7qaF/vHfMAZ3TXxWMbeQ68nCoNTjAFAG0K2U GNPuyaMyDF8zVMrI0vfpKZHy6qthSgeE5nkYzEcnrQzWyZXWFA6tl3gFR1f1YNU3G+jQWC 4WhN9qvcflRon5CfuSpNO8JF8y2+huhZivTKSsRjCLnmkCfcG6UTxj3nZLVkCEyDkkiP9c 6e5Rr2TKqaw7LUcdCI5znNs1/GKZE2HMZsgDM9K1znCsyV/KeD+dFHNDeNYjBQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696325634; 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=kFjy5OAkqj+RcMJ8GorPj2rGPTj6R6wFhYpPtVDM/ig=; b=sqow5UEuSw/w4wIXtAU6L8kmNMQ5QI2JvftOhHeRyVgTXZH4yI2dPSCW+lP0wkdkKwv5QV 7xwczprWLX4vcTCA== From: "tip-bot2 for Wang Jinchao" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/boot: Harmonize the style of array-type parameter for fixup_pointer() calls Cc: Wang Jinchao , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169632563389.3135.2507712498774997414.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 03 Oct 2023 02:34:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778726372671516071 X-GMAIL-MSGID: 1778726372671516071 The following commit has been merged into the x86/boot branch of tip: Commit-ID: 9f76d606269be7bd1ee5942b7c9c21bb0b43825f Gitweb: https://git.kernel.org/tip/9f76d606269be7bd1ee5942b7c9c21bb0b43825f Author: Wang Jinchao AuthorDate: Thu, 03 Aug 2023 17:44:00 +08:00 Committer: Ingo Molnar CommitterDate: Tue, 03 Oct 2023 11:28:38 +02:00 x86/boot: Harmonize the style of array-type parameter for fixup_pointer() calls The usage of '&' before the array parameter is redundant because '&array' is equivalent to 'array'. Therefore, there is no need to include '&' before the array parameter. In fact, using '&' can cause more confusion, especially for individuals who are not familiar with the address-of operation for arrays. They might mistakenly believe that one is different from the other and spend additional time realizing that they are actually the same. Harmonizing the style by removing the unnecessary '&' would save time for those individuals. Signed-off-by: Wang Jinchao Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/ZMt24BGEX9IhPSY6@fedora --- arch/x86/kernel/head64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index bbc2179..d6ca9c5 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -211,7 +211,7 @@ unsigned long __head __startup_64(unsigned long physaddr, /* Fixup the physical addresses in the page table */ - pgd = fixup_pointer(&early_top_pgt, physaddr); + pgd = fixup_pointer(early_top_pgt, physaddr); p = pgd + pgd_index(__START_KERNEL_map); if (la57) *p = (unsigned long)level4_kernel_pgt; @@ -220,11 +220,11 @@ unsigned long __head __startup_64(unsigned long physaddr, *p += _PAGE_TABLE_NOENC - __START_KERNEL_map + load_delta; if (la57) { - p4d = fixup_pointer(&level4_kernel_pgt, physaddr); + p4d = fixup_pointer(level4_kernel_pgt, physaddr); p4d[511] += load_delta; } - pud = fixup_pointer(&level3_kernel_pgt, physaddr); + pud = fixup_pointer(level3_kernel_pgt, physaddr); pud[510] += load_delta; pud[511] += load_delta;