From d301d1501bc31355d0b202371a7c87f097d9ed8f Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Tue, 25 Apr 1989 21:50:57 -0800 Subject: [PATCH] ../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 --- usr/src/sys/kern/init_main.c | 10 +++++----- usr/src/sys/kern/kern_exec.c | 12 ++++++------ usr/src/sys/kern/kern_exit.c | 6 +++--- usr/src/sys/kern/kern_fork.c | 10 +++++----- usr/src/sys/kern/kern_physio.c | 6 +++--- usr/src/sys/kern/kern_proc.c | 10 +++++----- usr/src/sys/kern/kern_prot.c | 6 +++--- usr/src/sys/kern/kern_sig.c | 12 ++++++------ usr/src/sys/kern/kern_time.c | 6 +++--- usr/src/sys/kern/sys_process.c | 10 +++++----- usr/src/sys/kern/tty.c | 6 +++--- usr/src/sys/kern/tty_compat.c | 6 +++--- usr/src/sys/kern/vfs_bio.c | 6 +++--- usr/src/sys/kern/vfs_cluster.c | 6 +++--- usr/src/sys/kern/vfs_vnops.c | 6 +++--- usr/src/sys/net/if_ethersubr.c | 4 ++-- usr/src/sys/net/route.c | 6 +++--- usr/src/sys/net/rtsock.c | 4 ++-- usr/src/sys/netiso/if_eon.c | 4 ++-- usr/src/sys/netiso/if_lpb.c | 2 +- usr/src/sys/netiso/te.c | 2 +- usr/src/sys/netns/ns_ip.c | 4 ++-- usr/src/sys/sys/user.h | 4 ++-- usr/src/sys/vax/uba/qv.c | 8 ++++---- 24 files changed, 78 insertions(+), 78 deletions(-) diff --git a/usr/src/sys/kern/init_main.c b/usr/src/sys/kern/init_main.c index 286ff7964d..57dfb1ad13 100644 --- 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. * - * @(#)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" @@ -29,8 +27,10 @@ #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; /* diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c index 1ebd5be59d..76b18c3976 100644 --- 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. * - * @(#)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" @@ -28,6 +23,11 @@ #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. */ diff --git a/usr/src/sys/kern/kern_exit.c b/usr/src/sys/kern/kern_exit.c index be19c1f59b..ec7ce799d8 100644 --- 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. * - * @(#)kern_exit.c 7.5 (Berkeley) %G% + * @(#)kern_exit.c 7.6 (Berkeley) %G% */ #include "param.h" @@ -22,9 +22,9 @@ #include "syslog.h" #include "malloc.h" -#include "../machine/reg.h" +#include "machine/reg.h" #ifdef COMPAT_43 -#include "../machine/psl.h" +#include "machine/psl.h" #endif /* diff --git a/usr/src/sys/kern/kern_fork.c b/usr/src/sys/kern/kern_fork.c index d6e2f1c89f..d4c8883110 100644 --- 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. * - * @(#)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" @@ -25,6 +21,10 @@ #include "acct.h" #include "quota.h" +#include "machine/reg.h" +#include "machine/pte.h" +#include "machine/psl.h" + /* * fork system call. */ diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c index 7948572d51..79e2e03d24 100644 --- 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. * - * @(#)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" @@ -20,6 +18,8 @@ #include "trace.h" #include "map.h" #include "uio.h" + +#include "machine/pte.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 27dba8c47b..d7a187dcfd 100644 --- 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. * - * @(#)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" @@ -30,6 +26,10 @@ #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. */ diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c index 3062dadc69..7ca7e5325c 100644 --- 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. * - * @(#)kern_prot.c 7.3 (Berkeley) %G% + * @(#)kern_prot.c 7.4 (Berkeley) %G% */ /* * System calls related to processes and protection */ -#include "../machine/reg.h" - #include "param.h" #include "systm.h" #include "dir.h" @@ -26,6 +24,8 @@ #include "mount.h" #include "quota.h" +#include "machine/reg.h" + getpid() { diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c index d5cbc3fc75..693fd640ad 100644 --- 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. * - * @(#)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" @@ -28,6 +23,11 @@ #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)) diff --git a/usr/src/sys/kern/kern_time.c b/usr/src/sys/kern/kern_time.c index 3398e789a6..ecba17a4fe 100644 --- 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. * - * @(#)kern_time.c 7.6 (Berkeley) %G% + * @(#)kern_time.c 7.7 (Berkeley) %G% */ #include "param.h" @@ -12,8 +12,8 @@ #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. diff --git a/usr/src/sys/kern/sys_process.c b/usr/src/sys/kern/sys_process.c index 15a5778d31..33aeaa4d56 100644 --- 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. * - * @(#)sys_process.c 7.4 (Berkeley) %G% + * @(#)sys_process.c 7.5 (Berkeley) %G% */ #define IPCREG -#include "../machine/reg.h" -#include "../machine/psl.h" -#include "../machine/pte.h" - #include "param.h" #include "systm.h" #include "dir.h" @@ -24,6 +20,10 @@ #include "acct.h" #include "ptrace.h" +#include "machine/reg.h" +#include "machine/psl.h" +#include "machine/pte.h" + /* * Priority for tracing */ diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c index 910466598b..9efe23ab57 100644 --- 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. * - * @(#)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" @@ -29,6 +27,8 @@ #include "uio.h" #include "kernel.h" #include "syslog.h" + +#include "machine/reg.h" #include "syslog.h" /* diff --git a/usr/src/sys/kern/tty_compat.c b/usr/src/sys/kern/tty_compat.c index c9354334f1..9cfb5725e4 100644 --- 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. * - * @(#)tty_compat.c 1.2 (Berkeley) %G% + * @(#)tty_compat.c 1.3 (Berkeley) %G% */ /* @@ -11,8 +11,6 @@ */ #ifdef COMPAT_43 -#include "../machine/reg.h" - #include "param.h" #include "systm.h" #include "dir.h" @@ -28,6 +26,8 @@ #include "kernel.h" #include "syslog.h" +#include "machine/reg.h" + 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 2e0bc02abb..0aef9f133e 100644 --- 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. * - * @(#)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" @@ -19,6 +17,8 @@ #include "vm.h" #include "trace.h" +#include "machine/pte.h" + /* * 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 4f74f8f9e1..fbaa042cfb 100644 --- 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. * - * @(#)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" @@ -19,6 +17,8 @@ #include "vm.h" #include "trace.h" +#include "machine/pte.h" + /* * 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 1e92578a7c..4a2b6b84c2 100644 --- 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. * - * @(#)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" @@ -22,6 +20,8 @@ #include "socketvar.h" #include "proc.h" +#include "machine/reg.h" + /* * 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 9aec93ad9d..1adda31841 100644 --- 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. * - * @(#)if_ethersubr.c 7.2 (Berkeley) %G% + * @(#)if_ethersubr.c 7.3 (Berkeley) %G% */ #include "param.h" @@ -32,7 +32,7 @@ #include "route.h" #include "if_llc.h" -#include "../machine/mtpr.h" +#include "machine/mtpr.h" #ifdef INET #include "../netinet/in.h" diff --git a/usr/src/sys/net/route.c b/usr/src/sys/net/route.c index cdf272cf32..2bf3fb6065 100644 --- 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. * - * @(#)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" @@ -40,7 +40,7 @@ #include "../netinet/in_var.h" #include "../netns/ns.h" -#include "../machine/mtpr.h" +#include "machine/mtpr.h" #include "netisr.h" #include "rtsock.c" diff --git a/usr/src/sys/net/rtsock.c b/usr/src/sys/net/rtsock.c index 288837dc8e..8346d6178e 100644 --- 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. * - * @(#)rtsock.c 7.2 (Berkeley) %G% + * @(#)rtsock.c 7.3 (Berkeley) %G% */ #ifndef RTF_UP @@ -33,7 +33,7 @@ #include "route.h" #include "raw_cb.h" -#include "../machine/mtpr.h" +#include "machine/mtpr.h" #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 53265b033c..21514ddd87 100644 --- 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 "../machine/mtpr.h" +#include "machine/mtpr.h" #include "../netinet/in.h" #include "../netinet/in_systm.h" @@ -88,7 +88,7 @@ extern int ip_output(); struct ifnet eonif[NEON]; #ifdef FAKEIOCCDEV -#include "../machine/io.h" +#include "machine/io.h" #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 2347671a7c..743880c9fd 100644 --- 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 "../machine/io.h" +#include "machine/io.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 62bef7a1a9..c69d6f8b7e 100644 --- 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 "../machine/io.h" +#include "machine/io.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 4454beda8d..85b9f50f90 100644 --- 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. * - * @(#)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 "../machine/mtpr.h" +#include "machine/mtpr.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 79b748073f..d7ed7d6ac3 100644 --- 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. * - * @(#)user.h 7.1 (Berkeley) %G% + * @(#)user.h 7.2 (Berkeley) %G% */ #ifdef KERNEL -#include "../machine/pcb.h" +#include "machine/pcb.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 631304d03d..d1058a831c 100644 --- 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. * - * @(#)qv.c 1.9 (Berkeley) %G% + * @(#)qv.c 1.10 (Berkeley) %G% */ /* @@ -107,7 +107,7 @@ #include "qv.h" #if NQV > 0 -#include "../machine/pte.h" +#include "machine/pte.h" #include "param.h" #include "conf.h" @@ -124,8 +124,8 @@ #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" -- 2.20.1