From b3f40a5ab5e47be828b8c14260009887a2321786 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@avtrex.com>
Date: Tue, 23 Sep 2008 00:09:51 -0700
Subject: [PATCH] --- yaml --- r: 111136 b: refs/heads/master c:
 2c708cbaa6031b73be6b992adb3ec1811f91cdb1 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/mips/include/asm/system.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b17b10f66f3d..3367c2e03657 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b67b2b703047bfaf62687ca64c9486599b609ef0
+refs/heads/master: 2c708cbaa6031b73be6b992adb3ec1811f91cdb1
diff --git a/trunk/arch/mips/include/asm/system.h b/trunk/arch/mips/include/asm/system.h
index a944eda4faf5..cd30f83235bb 100644
--- a/trunk/arch/mips/include/asm/system.h
+++ b/trunk/arch/mips/include/asm/system.h
@@ -20,6 +20,7 @@
 #include <asm/cmpxchg.h>
 #include <asm/cpu-features.h>
 #include <asm/dsp.h>
+#include <asm/watch.h>
 #include <asm/war.h>
 
 
@@ -76,6 +77,7 @@ do {									\
 		__restore_dsp(current);					\
 	if (cpu_has_userlocal)						\
 		write_c0_userlocal(current_thread_info()->tp_value);	\
+	__restore_watch();						\
 } while (0)
 
 static inline unsigned long __xchg_u32(volatile int * m, unsigned int val)