From patchwork Tue Jun 8 10:18:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Sverdlin X-Patchwork-Id: 12306239 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=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 83C84C47082 for ; Tue, 8 Jun 2021 10:20:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42A6260D07 for ; Tue, 8 Jun 2021 10:20:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 42A6260D07 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nokia.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=soI1DLf/jXSjrYnXd6mPtFBTA+0eSqcg6TUjS0bwyMY=; b=AUP7EqdIxho70p eoRm4yIigMOQUZcznAYpB56dSzQFnL0t2dlYX+BkUwFzn/2XQpoPTvF1TUFJNnKtXFVEyp9pnHp4E N1hrh5iQaujAC+2hKrWjdgc1QVBKKScyP6Yqy6P0vUZE/fXSfDyuOg4s7QoPO/aS5KqRRRi0wnau2 2yXaIwR2cI83wcuBb/Sgi4S37dl+WLrY7QJGNbgqNiplMjBAJcIdNTB1cmQN5J15NzLKE9DOd7Hau M/lqmSJHtGzHEa/eY10+DMEI866UnFNrIRMzOYr66la439X3a7FsijwLmn+mbKSO3TzThwTAtyOar MUBzVQyXyi0PXBULhpug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqYow-007gtP-F5; Tue, 08 Jun 2021 10:18:54 +0000 Received: from mail-eopbgr60132.outbound.protection.outlook.com ([40.107.6.132] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqYoo-007grk-SM for linux-arm-kernel@lists.infradead.org; Tue, 08 Jun 2021 10:18:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kV/yGwVePKSyA/9J2vh5FN6SvuS9I8585YqBUhWL1nZNAO90Bw1CohLUQrt+FEDW8BCIKYNcfhFH8xdSnf7AWxPuGXFx4/DiwndVRp+7Q+C2nYn8kRYUvgmR6Lq/qdB8WdZ3VHvCE7ztAjoefEqNyDg9EtHaw+fMmuY8UPRPO1yw7Zy/VyLRvRBaAFXemBfLQemUE6o0PZMYH5MTPVOnEsQ38X1oocoOEsGDRbKgx8bc3TtPUxceEhmp/r2dHUxcZTs56b7Fw939C7SiU+spvuTeSCTqH7Ny8o26oqmbGHkpvyypZQZVgP7ZS5Ft6zzFNXYy0j5pqYBL6hN038rpxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ygcRjJLj9aMmwXw+stqm5K3xBigAvsTL14UVt5fuYI0=; b=YSNEKrNlfZWGv9ki1+EAqK6IzuzfcsyYgtPFon5Hw/0WimxCG5rZPrEZCbkzRXvpNs19wupCYj2O7AlOI1mxddwh6jkl0L3z1Ho7iylsI/x3J/U3jHv/0ezRf4VYmJC9VuDxZ22GPxD56SycusncXOglJ9fVkYPP60TVSw/rtz7zdZ+8owL/bvDPjCZX+yq6oiqRONAIXKe/PjgaxICiAoyP4hdh1DdboX/TxEQ7/Vm1zEqukLE5BzitxJCXwudR4nph2tb/rFvkEaqXn+wwVnRKj9xJTGzUwoBA7h3+yRVFWkZiy7YukY9NDAvZxuHpXEGceGLTLWonmVJz8Q6Img== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.8) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nokia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nokia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ygcRjJLj9aMmwXw+stqm5K3xBigAvsTL14UVt5fuYI0=; b=UOZapE/C05LZLe/hX9CBcm6+L/x0J3TdWX65AC2BrSjhxH30q7j9b8qtYvIrCVWTA+hsgX5UlBBwi7D6mEG5mysnXjMDlRHdkq9BCiX5LS1DsMBoqEhD2OU2x8dHSlvNYyXfUPDnIDO2imB/fYS3CKVwP+QdwtRtMoxsnQU/cdk= Received: from AM6PR0502CA0052.eurprd05.prod.outlook.com (2603:10a6:20b:56::29) by PR3PR07MB8114.eurprd07.prod.outlook.com (2603:10a6:102:171::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.9; Tue, 8 Jun 2021 10:18:42 +0000 Received: from VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:56:cafe::a) by AM6PR0502CA0052.outlook.office365.com (2603:10a6:20b:56::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.22 via Frontend Transport; Tue, 8 Jun 2021 10:18:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.8) smtp.mailfrom=nokia.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.8 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.8; helo=fihe3nok0734.emea.nsn-net.net; Received: from fihe3nok0734.emea.nsn-net.net (131.228.2.8) by VE1EUR03FT009.mail.protection.outlook.com (10.152.18.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.21 via Frontend Transport; Tue, 8 Jun 2021 10:18:42 +0000 Received: from ulegcparamis.emea.nsn-net.net (ulegcparamis.emea.nsn-net.net [10.151.74.146]) by fihe3nok0734.emea.nsn-net.net (GMO) with ESMTP id 158AIcLN019880; Tue, 8 Jun 2021 10:18:39 GMT From: Alexander A Sverdlin To: Russell King , linux-arm-kernel@lists.infradead.org Cc: Alexander Sverdlin , linux-kernel@vger.kernel.org Subject: [PATCH] ARM: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Date: Tue, 8 Jun 2021 12:18:32 +0200 Message-Id: <20210608101832.6099-1-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.10.2 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: cd24f909-b846-4820-497f-08d92a66cab1 X-MS-TrafficTypeDiagnostic: PR3PR07MB8114: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ORjkKPhlr0Y5RXB134+7yZn1UJBUREDBOuj8wAGcHF+CrSG8Zj+Nl2Vy8l2GBfv4ALqH0woGQto+JwmMmlTls7sFP6TMY/CTbQXuyVldGPi2xwDjpbFpYPSmMngKX6ZOaP0nfAdN66L3E/rdm/SCpY1KlOXA2y1fRCkwiiE8h5C2c9lXeqOH5og8IXSRreuad3kEl2Yo62mdNc6HKKaZashyjDtzYiRGd0En67cL7FGT3ZLzk/2CnOrWSOUQ2bhj9BDlRfESIDEsasrwfPAjo42tucHD+AcHTtpm580Iq32Acb3L16xyogXbzp+trdeduCko5YSX3QatltyKIP28xN1+qbJ3RKctU8i3u66E1DPsxRe3kajQf3UY6W3Mdibxq0KNHaHEUZnwJ2px4Ny14udh2uxX6UDGU+xZ01FD3HKciSxeS7oR/63N9u8YFdQKfklAs1tnEI11gLV2QAlrOYffYMzv+sCPh8KgNf1vsDkcHe86eFMgdCWliwHK/dsYOuGlGIw/UwUWPaeSNySPNpVoURnnm524PxSGI2WU1S0l7N02v/jeNbJLPuUnUAkhZxtWkb9CG5u7YbeHRCEIj79a0ZsxfKhosp8H7M7YJLsXMvpvw3u59R5sz9+c2gOMq0zRaXoUc/gYlARKGi7KTh6qDKccS+iBaq/UVYOKIqUH/rnFBrJtnr8zvGmwExHE68cT9SB1ClM/WvFzxVVBUujWzhyLL6cYyrnWn7oTfmWCXVuV6Zx9Pk8pdJ9A/NUZ85Gi9m8r21+giCtjA3SBayEanKeaV3MwzprbV8SMHO6k7zSLDm9BNQGglyV8N1VU X-Forefront-Antispam-Report: CIP:131.228.2.8; CTRY:FI; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:fihe3nok0734.emea.nsn-net.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(346002)(136003)(376002)(39860400002)(396003)(46966006)(36840700001)(26005)(966005)(2906002)(2616005)(70206006)(82740400003)(8936002)(70586007)(4326008)(336012)(83380400001)(81166007)(8676002)(1076003)(356005)(86362001)(47076005)(478600001)(316002)(36860700001)(82310400003)(4744005)(5660300002)(6666004)(36756003)(186003)(36900700001); DIR:OUT; SFP:1102; X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2021 10:18:42.4463 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd24f909-b846-4820-497f-08d92a66cab1 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.8]; Helo=[fihe3nok0734.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR07MB8114 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210608_031847_006867_49FF7395 X-CRM114-Status: GOOD ( 10.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Alexander Sverdlin FTRACE_ADDR is only defined when CONFIG_DYNAMIC_FTRACE is defined, the latter is even stronger requirement than CONFIG_FUNCTION_TRACER (which is enough for MCOUNT_ADDR). Fixes: 1f12fb25c5c5d22f ("ARM: 9079/1: ftrace: Add MODULE_PLTS support") Reported-by: kernel test robot Link: https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/ZUVCQBHDMFVR7CCB7JPESLJEWERZDJ3T/ Signed-off-by: Alexander Sverdlin --- arch/arm/kernel/module-plts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c index a0524ad..1fc309b 100644 --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -22,7 +22,7 @@ #endif static const u32 fixed_plts[] = { -#ifdef CONFIG_FUNCTION_TRACER +#ifdef CONFIG_DYNAMIC_FTRACE FTRACE_ADDR, MCOUNT_ADDR, #endif