From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul.walmsley@sifive•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nathan Chancellor <nathan@kernel•org>,
Palmer Dabbelt <palmer@rivosinc•com>,
Zong Li <zong.li@sifive•com>
Subject: linux-next: manual merge of the mm-nonmm-stable tree with the risc-v-fixes tree
Date: Mon, 26 Feb 2024 09:27:11 +1100 [thread overview]
Message-ID: <20240226092711.7985af2e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]
Hi all,
Today's linux-next merge of the mm-nonmm-stable tree got a conflict in:
arch/riscv/include/asm/ftrace.h
between commit:
680341382da5 ("riscv: add CALLER_ADDRx support")
from the risc-v-fixes tree and commit:
de5f3984664e ("riscv: remove MCOUNT_NAME workaround")
from the mm-nonmm-stable tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/riscv/include/asm/ftrace.h
index 15055f9df4da,cf5b63e789fa..000000000000
--- a/arch/riscv/include/asm/ftrace.h
+++ b/arch/riscv/include/asm/ftrace.h
@@@ -13,24 -13,9 +13,14 @@@
#endif
#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
- /*
- * Clang prior to 13 had "mcount" instead of "_mcount":
- * https://reviews.llvm.org/D98881
- */
- #if defined(CONFIG_CC_IS_GCC) || CONFIG_CLANG_VERSION >= 130000
- #define MCOUNT_NAME _mcount
- #else
- #define MCOUNT_NAME mcount
- #endif
-
#define ARCH_SUPPORTS_FTRACE_OPS 1
#ifndef __ASSEMBLY__
+
+extern void *return_address(unsigned int level);
+
+#define ftrace_return_address(n) return_address(n)
+
- void MCOUNT_NAME(void);
+ void _mcount(void);
static inline unsigned long ftrace_call_adjust(unsigned long addr)
{
return addr;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2024-02-25 22:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240226092711.7985af2e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nathan@kernel$(echo .)org \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul.walmsley@sifive$(echo .)com \
--cc=zong.li@sifive$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox