5 files changed, 2 insertions, 15 deletions
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index a5f91fda64a1..9df017dbfad3 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -349,11 +349,6 @@ syscall(struct trapframe *frame)
 
 	PCPU_INC(cnt.v_syscall);
 
-#ifdef KSE
-	if (p->p_flag & P_SA)
-		thread_user_enter(td);
-#endif
-
 	code = frame->fixreg[0];
 	params = (caddr_t)(frame->fixreg + FIRSTARG);
 	n = NARGREG;
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index 282e2e646f06..5bd1e2b6815c 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -264,7 +264,7 @@ is_physical_memory(addr)
 }
 
 /*
- * KSE functions
+ * Threading functions
  */
 void
 cpu_thread_exit(struct thread *td)
diff --git a/sys/powerpc/booke/trap.c b/sys/powerpc/booke/trap.c
index edd49f5a2be7..d50b7541f3c8 100644
--- a/sys/powerpc/booke/trap.c
+++ b/sys/powerpc/booke/trap.c
@@ -343,11 +343,6 @@ syscall(struct trapframe *frame)
 
 	PCPU_INC(cnt.v_syscall);
 
-#if KSE
-	if (p->p_flag & P_SA)
-		thread_user_enter(td);
-#endif
-
 	code = frame->fixreg[0];
 	params = (caddr_t)(frame->fixreg + FIRSTARG);
 	n = NARGREG;
diff --git a/sys/powerpc/booke/vm_machdep.c b/sys/powerpc/booke/vm_machdep.c
index fb7f2dbf73ad..eb85a6e7b4c8 100644
--- a/sys/powerpc/booke/vm_machdep.c
+++ b/sys/powerpc/booke/vm_machdep.c
@@ -408,7 +408,7 @@ is_physical_memory(vm_offset_t addr)
 }
 
 /*
- * KSE functions
+ * Thread functions
  */
 void
 cpu_thread_exit(struct thread *td)
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index 7204e8b23279..7c981d147ba4 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -14,6 +14,3 @@ device		uart_z8530
 
 options 	GEOM_PART_APM
 options 	GEOM_PART_MBR
-
-# KSE support went from being default to a kernel option
-options 	KSE