Date: Thu, 27 Jul 2006 20:37:12 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 102596 for review Message-ID: <200607272037.k6RKbCRB018220@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=102596 Change 102596 by jhb@jhb_mutex on 2006/07/27 20:37:01 Fix mismerges. Affected files ... .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#15 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#11 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#52 edit Differences ... ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#15 (text+ko) ==== @@ -276,8 +276,6 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - PTRACESTOP_SC(p, td, S_PT_SCX); } ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#11 (text+ko) ==== @@ -211,8 +211,6 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - PTRACESTOP_SC(p, td, S_PT_SCX); } /* ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#52 (text+ko) ==== @@ -494,8 +494,6 @@ STOPEVENT(p, S_SCX, code); PTRACESTOP_SC(p, td, S_PT_SCX); - - PTRACESTOP_SC(p, td, S_PT_SCX); } static int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607272037.k6RKbCRB018220>