diff --git a/[refs] b/[refs] index edbd832a87dc..ce3ef56e2b3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d752542ade337f059d12c59c4bc9c312befa1f1e +refs/heads/master: 0fa70efbd45a6c4fd946fa71c0a609f2c509d07c diff --git a/trunk/include/asm-sh/system.h b/trunk/include/asm-sh/system.h index 4faa2fb88616..288abeb5476f 100644 --- a/trunk/include/asm-sh/system.h +++ b/trunk/include/asm-sh/system.h @@ -255,8 +255,10 @@ static inline void *set_exception_table_evt(unsigned int evt, void *handler) */ #ifdef CONFIG_CPU_SH2A extern unsigned int instruction_size(unsigned int insn); -#else +#elif defined(CONFIG_SUPERH32) #define instruction_size(insn) (2) +#else +#define instruction_size(insn) (4) #endif /* XXX