From 59a0c3d91e038f97be5df5243a41a0e33db53122 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 11 May 2012 20:57:29 -0700 Subject: [PATCH] sparc32: Put back SPARC_BRANCH. It's needed for the floppy interrupt trap table patching. Signed-off-by: David S. Miller --- arch/sparc/include/asm/traps.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/sparc/include/asm/traps.h b/arch/sparc/include/asm/traps.h index 5fac90f18da3..3aa62dde343f 100644 --- a/arch/sparc/include/asm/traps.h +++ b/arch/sparc/include/asm/traps.h @@ -31,6 +31,13 @@ extern struct tt_entry *sparc_ttable; #define SPARC_MOV_CONST_L3(const) (0xa6102000 | (const&0xfff)) +/* The following assumes that the branch lies before the place we + * are branching to. This is the case for a trap vector... + * You have been warned. + */ +#define SPARC_BRANCH(dest_addr, inst_addr) \ + (0x10800000 | (((dest_addr-inst_addr)>>2)&0x3fffff)) + #define SPARC_RD_PSR_L0 (0xa1480000) #define SPARC_RD_WIM_L3 (0xa7500000) #define SPARC_NOP (0x01000000) -- 2.39.5