../machine => machine

SCCS-vsn: sys/vax/uba/qv.c 1.10
SCCS-vsn: sys/sys/user.h 7.2
SCCS-vsn: sys/net/if_ethersubr.c 7.3
SCCS-vsn: sys/net/route.c 7.10
SCCS-vsn: sys/net/rtsock.c 7.3
SCCS-vsn: sys/netiso/if_eon.c 7.3
SCCS-vsn: sys/netiso/if_lpb.c 7.3
SCCS-vsn: sys/netiso/te.c 7.2
SCCS-vsn: sys/netns/ns_ip.c 7.5
SCCS-vsn: sys/kern/kern_exec.c 7.9
SCCS-vsn: sys/kern/kern_exit.c 7.6
SCCS-vsn: sys/kern/kern_prot.c 7.4
SCCS-vsn: sys/kern/kern_sig.c 7.5
SCCS-vsn: sys/kern/kern_time.c 7.7
SCCS-vsn: sys/kern/sys_process.c 7.5
SCCS-vsn: sys/kern/vfs_bio.c 7.4
SCCS-vsn: sys/kern/vfs_cluster.c 7.4
SCCS-vsn: sys/kern/vfs_vnops.c 7.2
SCCS-vsn: sys/kern/kern_physio.c 7.5
SCCS-vsn: sys/kern/init_main.c 7.8
SCCS-vsn: sys/kern/kern_fork.c 7.4
SCCS-vsn: sys/kern/kern_proc.c 7.4
SCCS-vsn: sys/kern/tty.c 7.14
SCCS-vsn: sys/kern/tty_compat.c 1.3

diff --git a/usr/src/sys/kern/init_main.c b/usr/src/sys/kern/init_main.c
index 286ff79..57dfb1a 100644 (file)
--- a/usr/src/sys/kern/init_main.c
+++ b/usr/src/sys/kern/init_main.c
@@ -3,11 +3,9 @@
  * 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.
  *

- *     @(#)init_main.c 7.7 (Berkeley) %G%
+ *     @(#)init_main.c 7.8 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/pte.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -29,8 +27,10 @@
 #include "protosw.h"
 #include "quota.h"
 #include "reboot.h"
 #include "protosw.h"
 #include "quota.h"
 #include "reboot.h"

-#include "../machine/reg.h"
-#include "../machine/cpu.h"
+
+#include "machine/pte.h"
+#include "machine/reg.h"
+#include "machine/cpu.h"

 
 int    cmask = CMASK;
 /*
 
 int    cmask = CMASK;
 /*

diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index 1ebd5be..76b18c3 100644 (file)
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -3,14 +3,9 @@
  * 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.
  *

- *     @(#)kern_exec.c 7.8 (Berkeley) %G%
+ *     @(#)kern_exec.c 7.9 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-#include "../machine/pte.h"
-#include "../machine/psl.h"
-#include "../machine/mtpr.h"
-

 #include "param.h"
 #include "systm.h"
 #include "map.h"
 #include "param.h"
 #include "systm.h"
 #include "map.h"


@@ -28,6 +23,11 @@
 #include "acct.h"
 #include "exec.h"
 
 #include "acct.h"
 #include "exec.h"
 

+#include "machine/reg.h"
+#include "machine/pte.h"
+#include "machine/psl.h"
+#include "machine/mtpr.h"
+

 /*
  * exec system call, with and without environments.
  */
 /*
  * exec system call, with and without environments.
  */

diff --git a/usr/src/sys/kern/kern_exit.c b/usr/src/sys/kern/kern_exit.c
index be19c1f..ec7ce79 100644 (file)
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.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.
  *

- *     @(#)kern_exit.c 7.5 (Berkeley) %G%
+ *     @(#)kern_exit.c 7.6 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -22,9 +22,9 @@
 #include "syslog.h"
 #include "malloc.h"
 
 #include "syslog.h"
 #include "malloc.h"
 

-#include "../machine/reg.h"
+#include "machine/reg.h"

 #ifdef COMPAT_43
 #ifdef COMPAT_43

-#include "../machine/psl.h"
+#include "machine/psl.h"

 #endif
 
 /*
 #endif
 
 /*

diff --git a/usr/src/sys/kern/kern_fork.c b/usr/src/sys/kern/kern_fork.c
index d6e2f1c..d4c8883 100644 (file)
--- a/usr/src/sys/kern/kern_fork.c
+++ b/usr/src/sys/kern/kern_fork.c
@@ -3,13 +3,9 @@
  * 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.
  *

- *     @(#)kern_fork.c 7.3 (Berkeley) %G%
+ *     @(#)kern_fork.c 7.4 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-#include "../machine/pte.h"
-#include "../machine/psl.h"
-

 #include "param.h"
 #include "systm.h"
 #include "map.h"
 #include "param.h"
 #include "systm.h"
 #include "map.h"


@@ -25,6 +21,10 @@
 #include "acct.h"
 #include "quota.h"
 
 #include "acct.h"
 #include "quota.h"
 

+#include "machine/reg.h"
+#include "machine/pte.h"
+#include "machine/psl.h"
+

 /*
  * fork system call.
  */
 /*
  * fork system call.
  */

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index 7948572..79e2e03 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -3,11 +3,9 @@
  * 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.
  *

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

  */
 
  */
 

-#include "../machine/pte.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -20,6 +18,8 @@
 #include "trace.h"
 #include "map.h"
 #include "uio.h"
 #include "trace.h"
 #include "map.h"
 #include "uio.h"

+
+#include "machine/pte.h"

 #ifdef SECSIZE
 #include "file.h"
 #include "ioctl.h"
 #ifdef SECSIZE
 #include "file.h"
 #include "ioctl.h"

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index 27dba8c..d7a187d 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -3,13 +3,9 @@
  * 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.
  *

- *     @(#)kern_proc.c 7.3 (Berkeley) %G%
+ *     @(#)kern_proc.c 7.4 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-#include "../machine/pte.h"
-#include "../machine/psl.h"
-

 #include "param.h"
 #include "systm.h"
 #include "map.h"
 #include "param.h"
 #include "systm.h"
 #include "map.h"


@@ -30,6 +26,10 @@
 #include "mbuf.h"
 #include "tty.h"
 
 #include "mbuf.h"
 #include "tty.h"
 

+#include "machine/reg.h"
+#include "machine/pte.h"
+#include "machine/psl.h"
+

 /*
  * Clear any pending stops for top and all descendents.
  */
 /*
  * Clear any pending stops for top and all descendents.
  */

diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index 3062dad..7ca7e53 100644 (file)
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -3,15 +3,13 @@
  * 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.
  *

- *     @(#)kern_prot.c 7.3 (Berkeley) %G%
+ *     @(#)kern_prot.c 7.4 (Berkeley) %G%

  */
 
 /*
  * System calls related to processes and protection
  */
 
  */
 
 /*
  * System calls related to processes and protection
  */
 

-#include "../machine/reg.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -26,6 +24,8 @@
 #include "mount.h"
 #include "quota.h"
 
 #include "mount.h"
 #include "quota.h"
 

+#include "machine/reg.h"
+

 getpid()
 {
 
 getpid()
 {
 

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index d5cbc3f..693fd64 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -3,14 +3,9 @@
  * 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.
  *

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

  */
 
  */
 

-#include "../machine/reg.h"
-#include "../machine/pte.h"
-#include "../machine/psl.h"
-#include "../machine/mtpr.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -28,6 +23,11 @@
 #include "uio.h"
 #include "kernel.h"
 
 #include "uio.h"
 #include "kernel.h"
 

+#include "machine/reg.h"
+#include "machine/pte.h"
+#include "machine/psl.h"
+#include "machine/mtpr.h"
+

 #define        cantmask        (sigmask(SIGKILL)|sigmask(SIGCONT)|sigmask(SIGSTOP))
 #define        stopsigmask     (sigmask(SIGSTOP)|sigmask(SIGTSTP)| \
                        sigmask(SIGTTIN)|sigmask(SIGTTOU))
 #define        cantmask        (sigmask(SIGKILL)|sigmask(SIGCONT)|sigmask(SIGSTOP))
 #define        stopsigmask     (sigmask(SIGSTOP)|sigmask(SIGTSTP)| \
                        sigmask(SIGTTIN)|sigmask(SIGTTOU))

diff --git a/usr/src/sys/kern/kern_time.c b/usr/src/sys/kern/kern_time.c
index 3398e78..ecba17a 100644 (file)
--- a/usr/src/sys/kern/kern_time.c
+++ b/usr/src/sys/kern/kern_time.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.
  *

- *     @(#)kern_time.c 7.6 (Berkeley) %G%
+ *     @(#)kern_time.c 7.7 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -12,8 +12,8 @@
 #include "kernel.h"
 #include "proc.h"
 
 #include "kernel.h"
 #include "proc.h"
 

-#include "../machine/reg.h"
-#include "../machine/cpu.h"
+#include "machine/reg.h"
+#include "machine/cpu.h"

 
 /* 
  * Time of day and interval timer support.
 
 /* 
  * Time of day and interval timer support.

diff --git a/usr/src/sys/kern/sys_process.c b/usr/src/sys/kern/sys_process.c
index 15a5778..33aeaa4 100644 (file)
--- a/usr/src/sys/kern/sys_process.c
+++ b/usr/src/sys/kern/sys_process.c
@@ -3,14 +3,10 @@
  * 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.
  *

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

  */
 
 #define IPCREG
  */
 
 #define IPCREG

-#include "../machine/reg.h"
-#include "../machine/psl.h"
-#include "../machine/pte.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -24,6 +20,10 @@
 #include "acct.h"
 #include "ptrace.h"
 
 #include "acct.h"
 #include "ptrace.h"
 

+#include "machine/reg.h"
+#include "machine/psl.h"
+#include "machine/pte.h"
+

 /*
  * Priority for tracing
  */
 /*
  * Priority for tracing
  */

diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index 9104665..9efe23a 100644 (file)
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -3,11 +3,9 @@
  * 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.
  *

- *     @(#)tty.c       7.13 (Berkeley) %G%
+ *     @(#)tty.c       7.14 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -29,6 +27,8 @@
 #include "uio.h"
 #include "kernel.h"
 #include "syslog.h"
 #include "uio.h"
 #include "kernel.h"
 #include "syslog.h"

+
+#include "machine/reg.h"

 #include "syslog.h"
 
 /*
 #include "syslog.h"
 
 /*

diff --git a/usr/src/sys/kern/tty_compat.c b/usr/src/sys/kern/tty_compat.c
index c935433..9cfb572 100644 (file)
--- a/usr/src/sys/kern/tty_compat.c
+++ b/usr/src/sys/kern/tty_compat.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.
  *

- *     @(#)tty_compat.c        1.2 (Berkeley) %G%
+ *     @(#)tty_compat.c        1.3 (Berkeley) %G%

  */
 
 /* 
  */
 
 /* 


@@ -11,8 +11,6 @@
  */
 #ifdef COMPAT_43
 
  */
 #ifdef COMPAT_43
 

-#include "../machine/reg.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -28,6 +26,8 @@
 #include "kernel.h"
 #include "syslog.h"
 
 #include "kernel.h"
 #include "syslog.h"
 

+#include "machine/reg.h"
+

 int ttydebug = 0;
 
 /* XXX - fold these two tables into one */
 int ttydebug = 0;
 
 /* XXX - fold these two tables into one */

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 2e0bc02..0aef9f1 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -3,11 +3,9 @@
  * 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.
  *

- *     @(#)vfs_bio.c   7.3 (Berkeley) %G%
+ *     @(#)vfs_bio.c   7.4 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/pte.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -19,6 +17,8 @@
 #include "vm.h"
 #include "trace.h"
 
 #include "vm.h"
 #include "trace.h"
 

+#include "machine/pte.h"
+

 /*
  * Read in (if necessary) the block and return a buffer pointer.
  */
 /*
  * Read in (if necessary) the block and return a buffer pointer.
  */

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 4f74f8f..fbaa042 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -3,11 +3,9 @@
  * 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.
  *

- *     @(#)vfs_cluster.c       7.3 (Berkeley) %G%
+ *     @(#)vfs_cluster.c       7.4 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/pte.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -19,6 +17,8 @@
 #include "vm.h"
 #include "trace.h"
 
 #include "vm.h"
 #include "trace.h"
 

+#include "machine/pte.h"
+

 /*
  * Read in (if necessary) the block and return a buffer pointer.
  */
 /*
  * Read in (if necessary) the block and return a buffer pointer.
  */

diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index 1e92578..4a2b6b8 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -3,11 +3,9 @@
  * 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.
  *

- *     @(#)vfs_vnops.c 7.1 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../machine/reg.h"
-

 #include "param.h"
 #include "systm.h"
 #include "dir.h"
 #include "param.h"
 #include "systm.h"
 #include "dir.h"


@@ -22,6 +20,8 @@
 #include "socketvar.h"
 #include "proc.h"
 
 #include "socketvar.h"
 #include "proc.h"
 

+#include "machine/reg.h"
+

 /*
  * Check mode permission on inode pointer.
  * Mode is READ, WRITE or EXEC.
 /*
  * Check mode permission on inode pointer.
  * Mode is READ, WRITE or EXEC.

diff --git a/usr/src/sys/net/if_ethersubr.c b/usr/src/sys/net/if_ethersubr.c
index 9aec93a..1adda31 100644 (file)
--- a/usr/src/sys/net/if_ethersubr.c
+++ b/usr/src/sys/net/if_ethersubr.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)if_ethersubr.c      7.2 (Berkeley) %G%
+ *     @(#)if_ethersubr.c      7.3 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -32,7 +32,7 @@
 #include "route.h"
 #include "if_llc.h"
 
 #include "route.h"
 #include "if_llc.h"
 

-#include "../machine/mtpr.h"
+#include "machine/mtpr.h"

 
 #ifdef INET
 #include "../netinet/in.h"
 
 #ifdef INET
 #include "../netinet/in.h"

diff --git a/usr/src/sys/net/route.c b/usr/src/sys/net/route.c
index cdf272c..2bf3fb6 100644 (file)
--- a/usr/src/sys/net/route.c
+++ b/usr/src/sys/net/route.c
@@ -14,9 +14,9 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)route.c     7.9 (Berkeley) %G%
+ *     @(#)route.c     7.10 (Berkeley) %G%

  */
  */

-#include "../machine/reg.h"
+#include "machine/reg.h"

  
 #include "param.h"
 #include "systm.h"
  
 #include "param.h"
 #include "systm.h"


@@ -40,7 +40,7 @@
 #include "../netinet/in_var.h"
 
 #include "../netns/ns.h"
 #include "../netinet/in_var.h"
 
 #include "../netns/ns.h"

-#include "../machine/mtpr.h"
+#include "machine/mtpr.h"

 #include "netisr.h"
 
 #include "rtsock.c"
 #include "netisr.h"
 
 #include "rtsock.c"

diff --git a/usr/src/sys/net/rtsock.c b/usr/src/sys/net/rtsock.c
index 288837d..8346d61 100644 (file)
--- a/usr/src/sys/net/rtsock.c
+++ b/usr/src/sys/net/rtsock.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)rtsock.c    7.2 (Berkeley) %G%
+ *     @(#)rtsock.c    7.3 (Berkeley) %G%

  */
 
 #ifndef RTF_UP
  */
 
 #ifndef RTF_UP


@@ -33,7 +33,7 @@
 #include "route.h"
 #include "raw_cb.h"
 
 #include "route.h"
 #include "raw_cb.h"
 

-#include "../machine/mtpr.h"
+#include "machine/mtpr.h"

 #endif
 
 struct sockaddr route_dst = { 0, PF_ROUTE, };
 #endif
 
 struct sockaddr route_dst = { 0, PF_ROUTE, };

diff --git a/usr/src/sys/netiso/if_eon.c b/usr/src/sys/netiso/if_eon.c
index 53265b0..21514dd 100644 (file)
--- a/usr/src/sys/netiso/if_eon.c
+++ b/usr/src/sys/netiso/if_eon.c
@@ -59,7 +59,7 @@ static char *rcsid = "$Header: if_eon.c,v 1.4 88/07/19 15:53:59 hagens Exp $";
 #include "../net/iftypes.h"
 #include "../net/netisr.h"
 #include "../net/route.h"
 #include "../net/iftypes.h"
 #include "../net/netisr.h"
 #include "../net/route.h"

-#include "../machine/mtpr.h"
+#include "machine/mtpr.h"

 
 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"
 
 #include "../netinet/in.h"
 #include "../netinet/in_systm.h"


@@ -88,7 +88,7 @@ extern        int                             ip_output();
 struct ifnet                   eonif[NEON];
 
 #ifdef FAKEIOCCDEV
 struct ifnet                   eonif[NEON];
 
 #ifdef FAKEIOCCDEV

-#include "../machine/io.h"
+#include "machine/io.h"

 #include "../machineio/ioccvar.h"
 
 #define EON_FAKE_CSR 0
 #include "../machineio/ioccvar.h"
 
 #define EON_FAKE_CSR 0

diff --git a/usr/src/sys/netiso/if_lpb.c b/usr/src/sys/netiso/if_lpb.c
index 2347671..743880c 100644 (file)
--- a/usr/src/sys/netiso/if_lpb.c
+++ b/usr/src/sys/netiso/if_lpb.c
@@ -50,7 +50,7 @@ static char *rcsid = "$Header: if_lpb.c,v 4.2 88/06/29 14:59:38 hagens Exp $";
 #include "../net/if.h"
 #include "../net/netisr.h"
 #include "../net/route.h"
 #include "../net/if.h"
 #include "../net/netisr.h"
 #include "../net/route.h"

-#include "../machine/io.h"
+#include "machine/io.h"

 #include "../machineio/ioccvar.h"
 
 #include "ecn.h"
 #include "../machineio/ioccvar.h"
 
 #include "ecn.h"

diff --git a/usr/src/sys/netiso/te.c b/usr/src/sys/netiso/te.c
index 62bef7a..c69d6f8 100644 (file)
--- a/usr/src/sys/netiso/te.c
+++ b/usr/src/sys/netiso/te.c
@@ -32,7 +32,7 @@ static char *rcsid = "$Header: te.c,v 1.1 88/06/29 15:00:09 hagens Exp $";
 #include "errno.h"
 #include "types.h"
 
 #include "errno.h"
 #include "types.h"
 

-#include "../machine/io.h"
+#include "machine/io.h"

 #include "../machineio/ioccvar.h"
 
 #include "../net/if.h"
 #include "../machineio/ioccvar.h"
 
 #include "../net/if.h"

diff --git a/usr/src/sys/netns/ns_ip.c b/usr/src/sys/netns/ns_ip.c
index 4454bed..85b9f50 100644 (file)
--- a/usr/src/sys/netns/ns_ip.c
+++ b/usr/src/sys/netns/ns_ip.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

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

  */
 
 /*
  */
 
 /*


@@ -42,7 +42,7 @@
 #include "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 
 #include "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 

-#include "../machine/mtpr.h"
+#include "machine/mtpr.h"

 
 #include "../netns/ns.h"
 #include "../netns/ns_if.h"
 
 #include "../netns/ns.h"
 #include "../netns/ns_if.h"

diff --git a/usr/src/sys/sys/user.h b/usr/src/sys/sys/user.h
index 79b7480..d7ed7d6 100644 (file)
--- a/usr/src/sys/sys/user.h
+++ b/usr/src/sys/sys/user.h
@@ -3,11 +3,11 @@
  * 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.
  *

- *     @(#)user.h      7.1 (Berkeley) %G%
+ *     @(#)user.h      7.2 (Berkeley) %G%

  */
 
 #ifdef KERNEL
  */
 
 #ifdef KERNEL

-#include "../machine/pcb.h"
+#include "machine/pcb.h"

 #include "dmap.h"
 #include "time.h"
 #include "resource.h"
 #include "dmap.h"
 #include "time.h"
 #include "resource.h"

diff --git a/usr/src/sys/vax/uba/qv.c b/usr/src/sys/vax/uba/qv.c
index 631304d..d1058a8 100644 (file)
--- a/usr/src/sys/vax/uba/qv.c
+++ b/usr/src/sys/vax/uba/qv.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)qv.c        1.9 (Berkeley) %G%
+ *     @(#)qv.c        1.10 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -107,7 +107,7 @@
 #include "qv.h"
 #if NQV > 0
 
 #include "qv.h"
 #if NQV > 0
 

-#include "../machine/pte.h"
+#include "machine/pte.h"

 
 #include "param.h"
 #include "conf.h"
 
 #include "param.h"
 #include "conf.h"


@@ -124,8 +124,8 @@
 #include "uio.h"
 #include "kernel.h"
 #include "syslog.h"
 #include "uio.h"
 #include "kernel.h"
 #include "syslog.h"

-#include "../machine/cpu.h"
-#include "../machine/mtpr.h"
+#include "machine/cpu.h"
+#include "machine/mtpr.h"

 #include "ubareg.h"
 #include "ubavar.h"
 
 #include "ubareg.h"
 #include "ubavar.h"