>> diff --git a/arch/mips/include/asm/break.h b/arch/mips/include/asm/break.h >> index 9161e68..df9d090 100644 >> --- a/arch/mips/include/asm/break.h >> +++ b/arch/mips/include/asm/break.h >> @@ -27,6 +27,7 @@ >> #define BRK_STACKOVERFLOW 9 /* For Ada stackchecking */ >> #define BRK_NORLD 10 /* No rld found - not used by Linux/MIPS */ >> #define _BRK_THREADBP 11 /* For threads, user bp (used by debuggers) */ >> +#define BRK_BUG_MM 12 /* Used by BUG() in microMIPS mode */ >> #define BRK_BUG 512 /* Used by BUG() */ > > Can we move the CONFIG_CPU_MICROMIPS to here and just call the thing > BRK_BUG? > No, because this header file is exported in 'arch/mips/include/uapi/asm' now. I already discussed this with Ralf. >> #include <asm/break.h> >> +#ifdef CONFIG_CPU_MICROMIPS >> +#undef BRK_BUG >> +#define BRK_BUG BRK_BUG_MM >> +#endif >> > > ...We don't need this bit. Doing an #undef risks using different > values for BRK_BUG depending on whether or not asm/bug.h is included. > I was trying to avoid two #ifdef's in 'bug.h' but I can certainly get rid of the above and use two #ifdef's instead. -Steve
