diff --git a/[refs] b/[refs] index 7d84a9733249..2403d59dfffc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbdb4e9f3fd4914caba6f102e62eef23920ab1f4 +refs/heads/master: f007688a50cf5724049a4a5f17023fcdb0966b54 diff --git a/trunk/arch/sh/include/asm/traps_64.h b/trunk/arch/sh/include/asm/traps_64.h index c52d7f9a06c1..ef5eff919449 100644 --- a/trunk/arch/sh/include/asm/traps_64.h +++ b/trunk/arch/sh/include/asm/traps_64.h @@ -10,8 +10,22 @@ #ifndef __ASM_SH_TRAPS_64_H #define __ASM_SH_TRAPS_64_H +#include + extern void phys_stext(void); +#define lookup_exception_vector() \ +({ \ + unsigned long _vec; \ + \ + __asm__ __volatile__ ( \ + "getcon " __EXPEVT ", %0\n\t" \ + : "=r" (_vec) \ + ); \ + \ + _vec; \ +}) + static inline void trigger_address_error(void) { phys_stext();