Patch 1 fixes watchpoint breakage since v4.3. Patch 2 enables watchpoints in R6 kernels, where they are inadvertently disabled. Patches 3 and 4 are cosmetic cleanups, to replace magic numbers with preprocessor definitions. James Hogan (4): MIPS: Fix watchpoint restoration MIPS: Enable ptrace hw watchpoints on MIPS R6 MIPS: Add and use CAUSEF_WP definition MIPS: Add and use watch register field definitions arch/mips/Kconfig | 2 +- arch/mips/include/asm/mipsregs.h | 20 ++++++++++ arch/mips/include/asm/switch_to.h | 2 +- arch/mips/include/asm/watch.h | 10 ++--- arch/mips/kernel/pm.c | 2 +- arch/mips/kernel/ptrace.c | 7 ++-- arch/mips/kernel/traps.c | 5 +-- arch/mips/kernel/watch.c | 79 +++++++++++++++++++++------------------ 8 files changed, 76 insertions(+), 51 deletions(-) Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Paul Burton <paul.burton@xxxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx -- 2.4.10