From patchwork Wed Nov 6 03:04:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 2007248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=ASsBZCc8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev+bounces-2895-incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Xjqmn1THnz1xyS for ; Wed, 6 Nov 2024 14:04:24 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Xjqmf4BHDz2yGZ; Wed, 6 Nov 2024 14:04:18 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2404:9400:2221:ea00::3" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1730862258; cv=none; b=Be+zoG8Pc6vI6co8RR5mLUXPKAJwzAkKVEJeBn/4X6UgfasWx9mcH5wT0CrJVT8MYLJHYJK2PThARNQdNasDgIPHzgdpnGGicleis3Fqno6tf60BOZiMkgPiMgz3aYzYO8A81xlFOXoy4V3j06SZ7utItcamUxDlIn6mn2XChFdwlRPo90S67MGUICaeoQ0biV4yKPwfsqunH4gW3Gq30VBN6OQnSlKgIFjlxfY6urUNykCw4UEvEKVZPJR2mlnRD3MiPXLaaCs4QGiRnHfm/zgLSOeYkdhTWMIW/60k4caz4OvU/oP0NF0xjm11X6auDC++pkzEylCSe34nf/PSVQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1730862258; c=relaxed/relaxed; bh=s9b01BRLDdx+kydfCLwn4XCUIydahSsmU7oeUYqYYTY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=iIrt3jLO+3j0qy5VMhT2/mI/KCy/RW23z5eUFW6NMT5YIp+PzQywiUC1MzArZvoKp0yvO5uoz/GmpC+cz7JM3Y+idNds9utXTRr7AbdiCsy+TWvGyJTX+0qPvkfdRf5p33C5ADp8yVS34g2Nq+LlukskuYlUsozqBHCdYwM2lOfkZiuX0Bx4z/0rk3914ZN4WnS50GP83A2xwchYAqHQ9e6RE4R6h1F5TiTpybhu3iPE7osBRsUJ+u8L8Ao3W1SSE4PLfbWtiKDj2sdNR65CAhRmwZIao1grVHSVurs7mAE0/SfieNcgE44uwV8frcFNZkR1TRFce3bsJvmwnhMucw== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=ASsBZCc8; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=ASsBZCc8; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Xjqmb4cJPz2y8k for ; Wed, 6 Nov 2024 14:04:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1730862253; bh=s9b01BRLDdx+kydfCLwn4XCUIydahSsmU7oeUYqYYTY=; h=Date:From:To:Cc:Subject:From; b=ASsBZCc8TzsAp7qXjbYNsz7PBkvTpDSMiN2C7d9onxvhX5UDPq6PPHCMrFHtM5HsI L3EOVz2OMqt9X+RTnHQypBagY0xKe0ilgsF8gOGr51aTfp/p9fteWIjYUsXKvnIWtr VELWK/5iY7YkD0J2Tn9e0bHkZ1/wj8bi6xtp/EZ3iTeM3SJ+ac3cAlpJ/IhL3Nce5V RGSV5ObhVWA7GR4UpZecMsb5MdMImtLK2gqjuL4/sfgsV6WuyTztQnmQ6aVUt1FXPi BsTD+4DYNHlbO9xupcd9OglgedffGBbgjSDlO+4E5r4ElTmi/N/iNR/ChvFIJXbEQ0 J2UjtRmWab9lg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XjqmY0lBsz4x7D; Wed, 6 Nov 2024 14:04:12 +1100 (AEDT) Date: Wed, 6 Nov 2024 14:04:14 +1100 From: Stephen Rothwell To: Steven Rostedt , Masami Hiramatsu , Michael Ellerman Cc: Naveen N Rao , PowerPC , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the ftrace tree Message-ID: <20241106140414.760b502c@canb.auug.org.au> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on lists.ozlabs.org Hi all, After merging the ftrace tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: In file included from include/linux/ftrace.h:23, from include/linux/kvm_host.h:32, from arch/powerpc/include/asm/kvm_ppc.h:19, from arch/powerpc/include/asm/dbell.h:17, from arch/powerpc/kernel/asm-offsets.c:36: arch/powerpc/include/asm/ftrace.h: In function 'arch_ftrace_set_direct_caller': arch/powerpc/include/asm/ftrace.h:141:38: error: invalid use of undefined type 'struct ftrace_regs' 141 | struct pt_regs *regs = &fregs->regs; | ^~ Caused by commit 7888af4166d4 ("ftrace: Make ftrace_regs abstract from direct use") interacting with commit a52f6043a223 ("powerpc/ftrace: Add support for DYNAMIC_FTRACE_WITH_DIRECT_CALLS") from the powerpc tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Wed, 6 Nov 2024 13:33:53 +1100 Subject: [PATCH] fix up for "ftrace: Make ftrace_regs abstract from direct use" from the ftrace tree interacting with "powerpc/ftrace: Add support for DYNAMIC_FTRACE_WITH_DIRECT_CALLS" from the powerpc tree Signed-off-by: Stephen Rothwell --- arch/powerpc/include/asm/ftrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h index bb2c90997618..db481b336bca 100644 --- a/arch/powerpc/include/asm/ftrace.h +++ b/arch/powerpc/include/asm/ftrace.h @@ -138,7 +138,7 @@ unsigned long ftrace_call_adjust(unsigned long addr); */ static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs, unsigned long addr) { - struct pt_regs *regs = &fregs->regs; + struct pt_regs *regs = &arch_ftrace_regs(fregs)->regs; regs->orig_gpr3 = addr; }