Index: /trunk/source/lisp-kernel/x86-exceptions.c
===================================================================
--- /trunk/source/lisp-kernel/x86-exceptions.c	(revision 12817)
+++ /trunk/source/lisp-kernel/x86-exceptions.c	(revision 12818)
@@ -828,5 +828,5 @@
 	/* caught a write to a watched object */
 	LispObj cmain = nrs_CMAIN.vcell;
-	LispObj object = (LispObj)a->low + fulltag_misc; /* always uvectors */
+	LispObj obj = (LispObj)a->low + fulltag_misc; /* always uvectors */
 
 	if ((fulltag_of(cmain) == fulltag_misc) &&
@@ -834,8 +834,7 @@
 	  LispObj xcf = create_exception_callback_frame(xp, tcr);
 	  int skip;
-	  LispObj addr = (LispObj)a->low;
 
 	  /* The magic 2 means this was a write to a watchd object */
-	  skip = callback_to_lisp(tcr, cmain, xp, xcf, SIGSEGV, 2, object, 0);
+	  skip = callback_to_lisp(tcr, cmain, xp, xcf, SIGSEGV, 2, addr, obj);
 	  xpPC(xp) += skip;
 	  return true;