Eliminated pcb_inl. It was always 0 because context switches don't occur

in interrupt handlers.

4 files changed, 6 insertions, 18 deletions

diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index b9b7269..daedb20 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.37 1996/06/25 20:01:59 bde Exp $
+ *	$Id: swtch.s,v 1.38 1996/07/31 09:25:53 davidg Exp $
  */
 
 #include "apm.h"
@@ -297,9 +297,6 @@ ENTRY(cpu_switch)
 	movl	%esi,PCB_ESI(%ecx)
 	movl	%edi,PCB_EDI(%ecx)
 
-	movb	_intr_nesting_level,%al
-	movb	%al,PCB_INL(%ecx)
-
 #if NNPX > 0
 	/* have we used fp, and need a save? */
 	mov	_curproc,%eax
@@ -426,9 +423,7 @@ swtch_com:
 
 	movl	%edx,_curpcb
 	movl	%ecx,_curproc			/* into next process */
-
-	movb	PCB_INL(%edx),%al
-	movb	%al,_intr_nesting_level
+	movb	$0,_intr_nesting_level
 
 #ifdef	USER_LDT
 	cmpl	$0, PCB_USERLDT(%edx)
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index d3ae502..dbd428a 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.36 1996/05/02 22:24:53 phk Exp $
+ *	$Id: genassym.c,v 1.37 1996/07/31 09:25:51 davidg Exp $
  */
 
 #include <stdio.h>
@@ -154,7 +154,6 @@ main()
 	printf("#define\tPCB_FLAGS %p\n", &pcb->pcb_flags);
 	printf("#define\tPCB_SAVEFPU %p\n", &pcb->pcb_savefpu);
 	printf("#define\tPCB_SAVEFPU_SIZE %d\n", sizeof pcb->pcb_savefpu);
-	printf("#define\tPCB_INL %p\n", &pcb->pcb_inl);
 	printf("#define\tPCB_ONFAULT %p\n", &pcb->pcb_onfault);
 
 	printf("#define\tTF_ES %p\n", &tf->tf_es);
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index b9b7269..daedb20 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.37 1996/06/25 20:01:59 bde Exp $
+ *	$Id: swtch.s,v 1.38 1996/07/31 09:25:53 davidg Exp $
  */
 
 #include "apm.h"
@@ -297,9 +297,6 @@ ENTRY(cpu_switch)
 	movl	%esi,PCB_ESI(%ecx)
 	movl	%edi,PCB_EDI(%ecx)
 
-	movb	_intr_nesting_level,%al
-	movb	%al,PCB_INL(%ecx)
-
 #if NNPX > 0
 	/* have we used fp, and need a save? */
 	mov	_curproc,%eax
@@ -426,9 +423,7 @@ swtch_com:
 
 	movl	%edx,_curpcb
 	movl	%ecx,_curproc			/* into next process */
-
-	movb	PCB_INL(%edx),%al
-	movb	%al,_intr_nesting_level
+	movb	$0,_intr_nesting_level
 
 #ifdef	USER_LDT
 	cmpl	$0, PCB_USERLDT(%edx)
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index fdcedcf..4cbcc53 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- *	$Id: pcb.h,v 1.14 1996/04/25 06:20:19 phk Exp $
+ *	$Id: pcb.h,v 1.15 1996/05/01 03:47:04 bde Exp $
  */
 
 #ifndef _I386_PCB_H_
@@ -66,7 +66,6 @@ struct pcb {
  */
 	u_char	pcb_flags;
 #define	FP_SOFTFP	0x01	/* process using software fltng pnt emulator */
-	u_char	pcb_inl;	/* intr_nesting_level at context switch */
 	caddr_t	pcb_onfault;	/* copyin/out fault recovery */
 };