git: aad1685066fc - main - fbt: get rid of redundant defines

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=aad1685066fc2430d6ee9b3025369ba6bd513333

commit aad1685066fc2430d6ee9b3025369ba6bd513333
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-05-01 15:20:34 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-05-01 15:40:29 +0000

    fbt: get rid of redundant defines
    
    No functional change intended.
    
    Reviewed by:    markj
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D39882
---
 sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 --
 sys/cddl/dev/fbt/arm/fbt_isa.c     | 3 ---
 sys/cddl/dev/fbt/fbt.h             | 3 +++
 sys/cddl/dev/fbt/powerpc/fbt_isa.c | 2 --
 sys/cddl/dev/fbt/riscv/fbt_isa.c   | 2 --
 sys/cddl/dev/fbt/x86/fbt_isa.c     | 3 ---
 6 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
index 07f02e2edb72..26d750bf540c 100644
--- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c
+++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
@@ -42,8 +42,6 @@
 #define	AARCH64_BRK_IMM16_SHIFT	5
 #define	AARCH64_BRK_IMM16_VAL	(0x40d << AARCH64_BRK_IMM16_SHIFT)
 #define	FBT_PATCHVAL		(AARCH64_BRK | AARCH64_BRK_IMM16_VAL)
-#define	FBT_ENTRY	"entry"
-#define	FBT_RETURN	"return"
 #define	FBT_AFRAMES	4
 
 int
diff --git a/sys/cddl/dev/fbt/arm/fbt_isa.c b/sys/cddl/dev/fbt/arm/fbt_isa.c
index 0be28b56aa6a..d52809c9f227 100644
--- a/sys/cddl/dev/fbt/arm/fbt_isa.c
+++ b/sys/cddl/dev/fbt/arm/fbt_isa.c
@@ -45,9 +45,6 @@
 #define	FBT_JUMP		0xea000000
 #define	FBT_SUBSP		0xe24dd000
 
-#define	FBT_ENTRY	"entry"
-#define	FBT_RETURN	"return"
-
 int
 fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t rval)
 {
diff --git a/sys/cddl/dev/fbt/fbt.h b/sys/cddl/dev/fbt/fbt.h
index aa9bce564fa0..2816eec992ff 100644
--- a/sys/cddl/dev/fbt/fbt.h
+++ b/sys/cddl/dev/fbt/fbt.h
@@ -34,6 +34,9 @@
 
 #include "fbt_isa.h"
 
+#define	FBT_ENTRY	"entry"
+#define	FBT_RETURN	"return"
+
 /*
  * fbt_probe is a bit of a misnomer.  One of these structures is created for
  * each trace point of an FBT probe.  A probe might have multiple trace points
diff --git a/sys/cddl/dev/fbt/powerpc/fbt_isa.c b/sys/cddl/dev/fbt/powerpc/fbt_isa.c
index eb7feceb269d..7f52308e1f76 100644
--- a/sys/cddl/dev/fbt/powerpc/fbt_isa.c
+++ b/sys/cddl/dev/fbt/powerpc/fbt_isa.c
@@ -46,8 +46,6 @@
 #define FBT_BR_MASK		0x03fffffc
 #define FBT_IS_JUMP(instr)	((instr & ~FBT_BR_MASK) == FBT_BRANCH)
 
-#define	FBT_ENTRY	"entry"
-#define	FBT_RETURN	"return"
 #define	FBT_AFRAMES	5
 
 int
diff --git a/sys/cddl/dev/fbt/riscv/fbt_isa.c b/sys/cddl/dev/fbt/riscv/fbt_isa.c
index baf268028988..5c8340d9f001 100644
--- a/sys/cddl/dev/fbt/riscv/fbt_isa.c
+++ b/sys/cddl/dev/fbt/riscv/fbt_isa.c
@@ -43,8 +43,6 @@
 
 #define	FBT_C_PATCHVAL		MATCH_C_EBREAK
 #define	FBT_PATCHVAL		MATCH_EBREAK
-#define	FBT_ENTRY		"entry"
-#define	FBT_RETURN		"return"
 #define	FBT_AFRAMES		5
 
 int
diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c
index 481e65bd761b..8c536335791c 100644
--- a/sys/cddl/dev/fbt/x86/fbt_isa.c
+++ b/sys/cddl/dev/fbt/x86/fbt_isa.c
@@ -57,9 +57,6 @@
 #define	FBT_PATCHVAL		0xf0
 #endif
 
-#define	FBT_ENTRY	"entry"
-#define	FBT_RETURN	"return"
-
 int
 fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused)
 {