delete unneeded header file; merge in NFS support from Rick Macklem

SCCS-vsn: sys/vax/vax/Locore.c 7.5

diff --git a/usr/src/sys/vax/vax/Locore.c b/usr/src/sys/vax/vax/Locore.c
index cee8a2a..57cedfd 100644 (file)
--- a/usr/src/sys/vax/vax/Locore.c
+++ b/usr/src/sys/vax/vax/Locore.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)Locore.c    7.4 (Berkeley) %G%
+ *     @(#)Locore.c    7.5 (Berkeley) %G%

  */
 
 #include "dz.h"
  */
 
 #include "dz.h"


@@ -14,7 +14,6 @@
 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"

-#include "dir.h"

 #include "user.h"
 #include "vm.h"
 #include "ioctl.h"
 #include "user.h"
 #include "vm.h"
 #include "ioctl.h"


@@ -240,6 +239,10 @@ char       kmembase[100*NBPG];
 #if VAX8200 || VAX630
 struct pte Clockmap[1];
 #endif
 #if VAX8200 || VAX630
 struct pte Clockmap[1];
 #endif

+#ifdef NFS
+struct pte Nfsiomap[MAXPHYS/NBPG+1];
+char   nfsiobuf[MAXPHYS+NBPG];
+#endif

 
 /*ARGSUSED*/
 badaddr(addr, len) caddr_t addr; int len; { return (0); }
 
 /*ARGSUSED*/
 badaddr(addr, len) caddr_t addr; int len; { return (0); }