From patchwork Tue Aug 8 21:37:21 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: 132951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2440643vqr; Tue, 8 Aug 2023 15:52:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBgqSMMW2Jk6OSt/1fToTCcxjypY+cj3XvgIJGkZ4iPsXN+tzarkDcpFUh26bbtRFAm9+n X-Received: by 2002:a17:902:8c97:b0:1bc:56c3:ebb6 with SMTP id t23-20020a1709028c9700b001bc56c3ebb6mr1248242plo.8.1691535147606; Tue, 08 Aug 2023 15:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691535147; cv=none; d=google.com; s=arc-20160816; b=MyjgOscyzrIERByiAqxSJBFFR88qHgFTdG/q97E+fMUyur8d8HjtTfm1lI9QQmTUMU F5kBZHbaXMe2yFH9gdLAwHOu/GF8CPlVxZAXiOefDVxmkjWpMJsrcJsVYW4pgDJylg95 VSl8weMVAYbKlhCcJ3QHRb7PRmzj6yCJhe2TBpdWrpA7aIV7lK70QTZ84wwyKAwgSJZV rObFdKTgWZsIWmi684vpLay+Ml/7w4TdBVkfY48tdNvZrOMy++cHW52QdAXgKSCRqFJm rzgStyne47xF1dKgY+I7kebrXTm/eSng6etuJYkvwBE5plhosqEFQPZdelaFKaijvuMD JjQw== 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=kDkO5o+VYKafXt0UwqB1zta1+/jE80vGFNHWvcTQRJc=; fh=d6w8lwOVeZFSrP+hlXQK2HiW7bcFrMPBG97u8gPD8bY=; b=tfH6wid0+rX6C4kxShk7VYLe7f91UbbVwtFlVMIBbmViykmLGBuxMKoH5HTrkuEwbT Fmq3g70dZ+47KzxiDT2Lw2GhF5INZp1p+yl6vPD1xRn7XlsxI3/PbMz+s6h7S+SzRmbV 7dOvixdCcoisGNoYVgQAas5F9i9mADYmWM3Bws2jMCAgsxhJxI+rYw9LtxeIdGSgRwIv xWtaRpeTXxW5HG79KxAhK2q1m+b04Ol7bjpg1iboKa2x+tB3hxKnmclyKwViNAHP95fX pX5R88R7zKAgJeZ9QdwiFOSRevH2tCWS7oIKKG/oHA7ac3XuzUviR0ZedE4JDzk9Lh1k UWlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ISC+yFDJ; 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 j3-20020a170902f24300b001b896f8ae83si7783954plc.110.2023.08.08.15.52.14; Tue, 08 Aug 2023 15:52:27 -0700 (PDT) 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=ISC+yFDJ; 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 S229787AbjHHVhY (ORCPT + 99 others); Tue, 8 Aug 2023 17:37:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjHHVhX (ORCPT ); Tue, 8 Aug 2023 17:37:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19232E0; Tue, 8 Aug 2023 14:37:23 -0700 (PDT) Date: Tue, 08 Aug 2023 21:37:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691530641; 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=kDkO5o+VYKafXt0UwqB1zta1+/jE80vGFNHWvcTQRJc=; b=ISC+yFDJob9FQbdVKs6ZOLY6p/81fKqvBu/A8G1EW2fqdcD+L2+cMBHe2AC+GnIL0o3SEx U2wM8pUWDq/Coq6mDIKBwLFlszhLIg+TB1O7iCH4x2T+2RpZbFInzUWE5GfyrihX+vOkR8 n5PMmFoYzIXJA/zyJwanQCwv8cUkPRcv4jXDsLNeklnwRiGDpf+6dR8dAbn5D+9A+y+g+c S0waETU7+f9o9l+hdq3k5saVoMwtKKvk/xcbeEwj71qMBEvPYJ7r0vv1ieGWClnrx/xX8F uRCT1IdNcv2v/FjTAATkM01Os05mYsr0knuXfvjHP7n9LmqCC0wgBeCDbqtJ8w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691530641; 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=kDkO5o+VYKafXt0UwqB1zta1+/jE80vGFNHWvcTQRJc=; b=F9L1p5UJXsZ08eUfBLWiTvcPY+syiMCsT7uKiyLpS+9p7Lbo4GWe/lVHLb+4tDKU8J7jNd rjc2YGywYSpjF5AQ== From: "tip-bot2 for Jinghao Jia" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/linkage: Fix typo of BUILD_VDSO in asm/linkage.h Cc: Jinghao Jia , "Borislav Petkov (AMD)" , Thomas Gleixner , Randy Dunlap , , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230808182353.76218-1-jinghao@linux.ibm.com> References: <20230808182353.76218-1-jinghao@linux.ibm.com> MIME-Version: 1.0 Message-ID: <169153064106.27769.9957898091293450936.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773701449068685903 X-GMAIL-MSGID: 1773703158978132035 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 7324f74d39531262b8e362f228b46512e6bee632 Gitweb: https://git.kernel.org/tip/7324f74d39531262b8e362f228b46512e6bee632 Author: Jinghao Jia AuthorDate: Tue, 08 Aug 2023 14:23:53 -04:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 08 Aug 2023 23:13:17 +02:00 x86/linkage: Fix typo of BUILD_VDSO in asm/linkage.h The BUILD_VDSO macro was incorrectly spelled as BULID_VDSO in asm/linkage.h. This causes the !defined(BULID_VDSO) directive to always evaluate to true. Correct the spelling to BUILD_VDSO. Fixes: bea75b33895f ("x86/Kconfig: Introduce function padding") Signed-off-by: Jinghao Jia Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Thomas Gleixner Acked-by: Randy Dunlap Cc: Link: https://lore.kernel.org/r/20230808182353.76218-1-jinghao@linux.ibm.com --- arch/x86/include/asm/linkage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h index 0953aa3..97a3de7 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -21,7 +21,7 @@ #define FUNCTION_PADDING #endif -#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BULID_VDSO) +#if (CONFIG_FUNCTION_ALIGNMENT > 8) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) # define __FUNC_ALIGN __ALIGN; FUNCTION_PADDING #else # define __FUNC_ALIGN __ALIGN