PERFORCE change 107582 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=107582

Change 107582 by jb at jb_freebsd7 on 2006/10/09 21:17:37

	Fix a p4 mis-merge to retain KSE support but as a kernel option.

Affected files ...

.. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#9 edit

Differences ...

==== //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#9 (text+ko) ====

@@ -302,7 +302,7 @@
 #ifdef KSE
 			if (td->td_pflags & TDP_SA)
 				thread_user_enter(td);
-			i = trap_pfault(&frame, TRUE);
+#endif
 			i = trap_pfault(&frame, TRUE);
 			if (i == -1)
 				goto userout;