From patchwork Fri Jun 23 15:21:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 112219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5867989vqr; Fri, 23 Jun 2023 08:46:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ68PDIuWE65IBsSwxb/1l1eNu8ma9hsOtoXbD4ggoBo6WTXRJHw1BXPGfFpeyaoQr+feQxw X-Received: by 2002:a05:6a00:1355:b0:668:7209:1866 with SMTP id k21-20020a056a00135500b0066872091866mr14178113pfu.3.1687535180957; Fri, 23 Jun 2023 08:46:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687535180; cv=none; d=google.com; s=arc-20160816; b=yy3z9tvMpdg9bwL9vnerAtzTJ5rsXCSjKck9grK5rN33KltD6N7klHk04yBD8lX79H 7zx8i98l7IWiKg6bm5cZmY7Xyi+iytymcnyjitr/TTopsN7OAxT+BdQSe9gImXQ2kfVz g7K+AJkx1DYGvOgRtvMwkZZmjeMURLuYxbVMx8NzdVUvi/Qb3oUxPuTPVJGGLVAMj4iY p6AM8jWm2glaE/i6szYoJqlTACTE40mxJvBOMG8n0EmpKIUXbenqQImvQtux5jJbK9HO lWvjkYMCjT5oqzXm1xHSxWumI/Xxq+hg0GuCk5ydbDfrqK97fFfzDueBUnuO9bI3VuPr /ejQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=GYt3rEppoOQL8+ZLnVXrHidSZlYgL02m/Z4zPnmH5aY=; b=V6pol2jBIkJUER88LH26VZ09vJaIT4JLoE7L4EfhorfZI3HxrsyzWY1PD0GYM2y3hC ArY/ZaI70cr7V5KOaSejCvAvplRHBFClVCIQwpEo4l0gT5gVmNmeNZEdzuqI9Fc+VQgN /AIvE9RxmymfKKW2pD1EwUV3WA+t0ilgXs0aFTOaILGSMl0x3FA8NXOtO/iaEo09QZsx hO56xAfxJntgdDfeQToow5HEJ2GgaEPx0x4s4sRNPviHK04bu3hpuVEibJtBjlCjXYlE Q/9i5k6jsaR5r915ULkIY2O/GwHd9jwYVgGmk48s3I6yrN7VErAXg1wCXg2cWXvmZT9y wzNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OyfYhhQ7; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y1-20020aa79ae1000000b006687a9c88b4si1333755pfp.232.2023.06.23.08.46.06; Fri, 23 Jun 2023 08:46:20 -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=@kernel.org header.s=k20201202 header.b=OyfYhhQ7; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231714AbjFWPW2 (ORCPT + 99 others); Fri, 23 Jun 2023 11:22:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232376AbjFWPWM (ORCPT ); Fri, 23 Jun 2023 11:22:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45FDD19B for ; Fri, 23 Jun 2023 08:22:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D4B9F61A97 for ; Fri, 23 Jun 2023 15:22:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B2ECC433CC; Fri, 23 Jun 2023 15:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687533730; bh=PDmC4YA2NsJQMxRbgNA3iKcTYPuiiTgA/RrritCht8o=; h=From:To:Cc:Subject:Date:From; b=OyfYhhQ7N237/hBj0FLMeGBea8pEcu3RQWI27ZCWysCZGfIv0vRYz6ctD95U5UHWa QRxn2Z1AMJfKwZAW7ntxRBM4P2yKXZh4vZHZ1elQrxHXBM7GVltXBk9yAZqHyWxxax cty0ioHXO81m12xAyhfWBtxL4gyI1cdsAy7TbG9WnovHKP36Ilz47rKGv4hhdIro2o jJvP+Eslv17xAIwqgJmVe7clfkqizwYlFRnR9bSZz2VzXCbM8515zAKupay8Z3CXKD tUMwC/pGoIOmGs6tAcF3YB0pv7V5fWDFcHW0JQvIfE68VDM9AOIS1P7skh9dLMLatO 5VW6QKj/uE3Rg== From: Arnd Bergmann To: Catalin Marinas , Will Deacon , "Steven Rostedt (Google)" , Mark Rutland , Donglin Peng Cc: Arnd Bergmann , Florent Revest , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n Date: Fri, 23 Jun 2023 17:21:55 +0200 Message-Id: <20230623152204.2216297-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1769508889918985462?= X-GMAIL-MSGID: =?utf-8?q?1769508889918985462?= From: Arnd Bergmann It appears that a merge conflict ended up hiding a newly added constant in some configurations: arch/arm64/kernel/entry-ftrace.S: Assembler messages: arch/arm64/kernel/entry-ftrace.S:59: Error: undefined symbol FTRACE_OPS_DIRECT_CALL used as an immediate value FTRACE_OPS_DIRECT_CALL is still used when CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS is enabled, even if CONFIG_FUNCTION_GRAPH_TRACER is disabled, so change the ifdef accordingly. Fixes: 3646970322464 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL") Signed-off-by: Arnd Bergmann Acked-by: Florent Revest Reviewed-by: Randy Dunlap Tested-by: Randy Dunlap # build-tested Acked-by: Catalin Marinas --- arch/arm64/kernel/asm-offsets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 757d01a68ffd0..5ff1942b04fcf 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -213,9 +213,9 @@ int main(void) DEFINE(FGRET_REGS_X7, offsetof(struct fgraph_ret_regs, regs[7])); DEFINE(FGRET_REGS_FP, offsetof(struct fgraph_ret_regs, fp)); DEFINE(FGRET_REGS_SIZE, sizeof(struct fgraph_ret_regs)); +#endif #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS DEFINE(FTRACE_OPS_DIRECT_CALL, offsetof(struct ftrace_ops, direct_call)); -#endif #endif return 0; }