From patchwork Wed Jul 5 14:40:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 116190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1923816vqx; Wed, 5 Jul 2023 07:54:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQML30JEtXiKAx+4icV8q+2PvvqHIQLFSFkZtQAaFRd9nTY2cMKyRgNjHNdzMBoIMo3SNv X-Received: by 2002:a17:902:a415:b0:1b7:ecbb:aa06 with SMTP id p21-20020a170902a41500b001b7ecbbaa06mr15592636plq.55.1688568851416; Wed, 05 Jul 2023 07:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688568851; cv=none; d=google.com; s=arc-20160816; b=w6TprMnHlOWTYqle4Y6ugPb2dwCqQ5MYqwAV9/DLQxyWiJtm+6LF0cVBdH/+mRBwvB yVGuGrblOKz5uUR4g4RFriBl/LKW9v6FUkfPFugQuTnVVRrUB6uCANkUMmjucn2nDuYT 12pjzY4TPT/AbidbIMCiVRE8XR4NACec8WAcSpCTmZqTofU1D8xmNOEbnckCCDUrWlxw RGVGbSxV5j2jhzwtA0bJLSbozK/j2PGGP2EJO4WaynuW6No6/Alg/efFJpEbCW7u4WCx EnYAcVSkk4ii7liM85F3ZJVP+agcpGAtGZMIDvHZWAI0ZgiFlK+qrxoNdhpI4G2e/yL4 igjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=8wpr7HWYjC8QKsOYfU4kvQ4F8bosRCT9nVrMUCuOVlw=; fh=YYQeeErKdDfoDbUJLtwTGBvCGZPYow4/G5oV2k01wRA=; b=JS5uYk4l8kjC2g6h281MK7IS2MkAcQ0G5SkSiOfB2FcJdHcqpCQagOBlcye+3SC7kq tBuS9GOfFBXZX+PYcJCbM6PWBNeBMCL0/mx4w792+HZIU7XvfSa0SOLAw91RLfUJfUUp no3qGoiXrbQBKDzrUd9aKev6fjbcBReQIppNgcPDbgP0uv9Y9yb87tKFOQcYoGVnjYtd 5tJcNCJ/qkaXzJsT9hV+PTeOZMRInkrN2pzpMb6vinmvnp4dwQqr3k2GPOQIo7CDfm4C Buu78UIY1gn8po2EdKyFygcpxahthX54mkExBHcddS9/msQ3r3QA7S8dG6Vwn671nMpu zXwA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jf15-20020a170903268f00b001b89eefc9fbsi5182440plb.262.2023.07.05.07.53.58; Wed, 05 Jul 2023 07:54:11 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232693AbjGEOqp (ORCPT + 99 others); Wed, 5 Jul 2023 10:46:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232214AbjGEOqg (ORCPT ); Wed, 5 Jul 2023 10:46:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A8F610CF for ; Wed, 5 Jul 2023 07:46:34 -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 D2090615D5 for ; Wed, 5 Jul 2023 14:46:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40570C433CC; Wed, 5 Jul 2023 14:46:33 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qH3m4-003Phk-0s; Wed, 05 Jul 2023 10:46:32 -0400 Message-ID: <20230705144632.086008297@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 05 Jul 2023 10:40:33 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Will Deacon , Donglin Peng , Arnd Bergmann , Florent Revest , Randy Dunlap , Catalin Marinas Subject: [for-linus][PATCH 2/3] arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n References: <20230705144031.702796304@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,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?1770592771771776766?= X-GMAIL-MSGID: =?utf-8?q?1770592771771776766?= 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. Link: https://lkml.kernel.org/r/20230623152204.2216297-1-arnd@kernel.org Cc: Will Deacon Cc: Mark Rutland Cc: Donglin Peng 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 Signed-off-by: Steven Rostedt (Google) --- 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 757d01a68ffd..5ff1942b04fc 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; }