diff --git a/[refs] b/[refs] index 70b068fbc395..19809bab15b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a96102be700f87283f168942cd09a2b30f86f324 +refs/heads/master: 8e8dc33543504830e6444607ba856e60679995f1 diff --git a/trunk/arch/mips/include/uapi/asm/break.h b/trunk/arch/mips/include/uapi/asm/break.h index e5fa7b5b0556..73455e9be7a8 100644 --- a/trunk/arch/mips/include/uapi/asm/break.h +++ b/trunk/arch/mips/include/uapi/asm/break.h @@ -27,7 +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 512 /* Used by BUG() */ +#define BRK_BUG 12 /* Used by BUG() */ #define BRK_KDB 513 /* Used in KDB_ENTER() */ #define BRK_MEMU 514 /* Used by FPU emulator */ #define BRK_KPROBE_BP 515 /* Kprobe break */