From 7a09009b52642c9371335498cb900655a99cb2d8 Mon Sep 17 00:00:00 2001
From: ad <ad@NetBSD.org>
Date: Mon, 3 Dec 2007 19:06:36 +0000
Subject: [PATCH] Merge from vmlocking.

---
 sys/arch/i386/i386/locore.S | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/sys/arch/i386/i386/locore.S b/sys/arch/i386/i386/locore.S
index fe3eeaa9f32b..a59bdec24cc6 100644
--- a/sys/arch/i386/i386/locore.S
+++ b/sys/arch/i386/i386/locore.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.57 2007/11/14 17:54:59 ad Exp $	*/
+/*	$NetBSD: locore.S,v 1.58 2007/12/03 19:06:36 ad Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -722,7 +722,8 @@ ENTRY(longjmp)
 	ret
 
 /*
- * struct lwp *cpu_switchto(struct lwp *oldlwp, struct newlwp)
+ * struct lwp *cpu_switchto(struct lwp *oldlwp, struct newlwp,
+ *			    bool returning)
  *
  *	1. if (oldlwp != NULL), save its context.
  *	2. then, restore context of newlwp.
@@ -738,6 +739,7 @@ ENTRY(cpu_switchto)
 
 	movl	16(%esp),%esi		# oldlwp
 	movl	20(%esp),%edi		# newlwp
+	movl	24(%esp),%edx		# returning
 	testl	%esi,%esi
 	jz	1f
 
@@ -751,6 +753,13 @@ ENTRY(cpu_switchto)
 	movl	PCB_EBP(%ebx),%ebp
 	movl	PCB_ESP(%ebx),%esp
 
+	/* Set curlwp. */
+	movl	%edi,CPUVAR(CURLWP)
+
+	/* Skip the rest if returning to a pinned LWP. */
+	testl	%edx,%edx
+	jnz	4f
+
 	/* Switch TSS.  Reset "task busy" flag before loading. */
 	movl	%cr3,%eax
 	movl	%eax,PCB_CR3(%ebx)	# for TSS gates
@@ -759,9 +768,6 @@ ENTRY(cpu_switchto)
 	andl	$~0x0200,4(%ecx,%edx, 1)
 	ltr	%dx
 
-	/* Set curlwp. */
-	movl	%edi,CPUVAR(CURLWP)
-
 	/* Don't bother with the rest if switching to a system process. */
 	testl	$LW_SYSTEM,L_FLAG(%edi)
 	jnz	4f
@@ -905,10 +911,9 @@ syscall1:
 	pushl	$4f
 	call	_C_LABEL(printf)
 	addl	$4,%esp
-#ifdef DDB
-	int	$3
-#endif /* DDB */
-	movl	$IPL_NONE,CPUVAR(ILEVEL)
+	pushl	$IPL_NONE
+	call	_C_LABEL(spllower)
+	addl	$4,%esp
 	jmp	.Lsyscall_checkast
 4:	.asciz	"WARNING: SPL NOT LOWERED ON SYSCALL EXIT\n"
 5:	.asciz	"WARNING: SPL NOT ZERO ON SYSCALL ENTRY\n"