diff --git a/sys/arch/vax/include/psl.h b/sys/arch/vax/include/psl.h
index 6d29b7636065..88efbb0f5496 100644
--- a/sys/arch/vax/include/psl.h
+++ b/sys/arch/vax/include/psl.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: psl.h,v 1.5 1996/01/28 12:32:21 ragge Exp $      */
+/*      $NetBSD: psl.h,v 1.6 1997/06/07 12:15:28 ragge Exp $      */
 
 /*
  * Rewritten for the VAX port. Based on Berkeley code. /IC
@@ -86,7 +86,7 @@
 #define	PSL_S		0x02000000     	/* executive mode */
 #define	PSL_U		0x03000000	/* user mode */
 #define	PSL_IS		0x04000000	/* interrupt stack select */
-#define	PSL_FPD	        0x04000000	/* first part done flag */
+#define	PSL_FPD	        0x08000000	/* first part done flag */
 #define PSL_TP          0x40000000      /* trace pending */
 #define	PSL_CM		0x80000000	/* compatibility mode */
 
@@ -106,7 +106,7 @@
 #define	CLKF_USERMODE(framep)	((((framep)->ps) & (PSL_U)) == PSL_U)
 #define	CLKF_BASEPRI(framep)	((((framep)->ps) & (PSL_IPL1F)) == 0)
 #define	CLKF_PC(framep)		((framep)->pc)
-#define	CLKF_INTR(framep)	0
+#define	CLKF_INTR(framep)	((((framep)->ps) & (PSL_IS)) == PSL_IS)
 #define PSL2IPL(ps)             ((ps) >> 16)
 
 #endif
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index 9acb7a5cde98..a50db2248b4b 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: vm_machdep.c,v 1.31 1997/03/09 16:00:06 ragge Exp $       */
+/*      $NetBSD: vm_machdep.c,v 1.32 1997/06/07 12:15:27 ragge Exp $       */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -287,9 +287,12 @@ again:
 	return; /* New process! */
 
 idle:	
+	p = curproc;
+	curproc = NULL;		/* This is nice. /BQT */
 	spl0();
 	while (whichqs == 0)
 		;
+	curproc = p;
 	goto again;
 }