diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c --- 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 --- 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 --- 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 --- 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 --- 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 --- 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) {