kernel reorg

SCCS-vsn: usr.bin/showmount/Makefile 6.3
SCCS-vsn: sbin/fsck/Makefile 5.16
SCCS-vsn: lib/libc/gen/Makefile.inc 5.12
SCCS-vsn: lib/libc/tahoe/gen/ldexp.s 5.3
SCCS-vsn: usr.bin/uucp/uucico/tio.c 4.10
SCCS-vsn: usr.sbin/mkproto/Makefile 5.4
SCCS-vsn: usr.sbin/pstat/Makefile 5.4
SCCS-vsn: usr.sbin/quot/Makefile 5.5
SCCS-vsn: usr.bin/vmstat/Makefile 5.5
SCCS-vsn: usr.bin/w/Makefile 5.5
SCCS-vsn: usr.bin/systat/Makefile 5.8
SCCS-vsn: usr.bin/systat/disks.c 5.6
SCCS-vsn: usr.sbin/edquota/Makefile 5.4
SCCS-vsn: usr.sbin/quotaon/Makefile 5.4
SCCS-vsn: usr.sbin/repquota/Makefile 5.4
SCCS-vsn: usr.sbin/iostat/Makefile 5.5
SCCS-vsn: usr.sbin/iostat/iostat.c 4.18

diff --git a/usr/src/lib/libc/gen/Makefile.inc b/usr/src/lib/libc/gen/Makefile.inc
index 2b3b63a..fe1630e 100644 (file)
--- a/usr/src/lib/libc/gen/Makefile.inc
+++ b/usr/src/lib/libc/gen/Makefile.inc
@@ -1,4 +1,4 @@
-#      @(#)Makefile.inc        5.11 (Berkeley) %G%
+#      @(#)Makefile.inc        5.12 (Berkeley) %G%

 
 # gen sources
 .PATH: ${.CURDIR}/${MACHINE}/gen ${.CURDIR}/gen ${.CURDIR}/gen/regexp
 
 # gen sources
 .PATH: ${.CURDIR}/${MACHINE}/gen ${.CURDIR}/gen ${.CURDIR}/gen/regexp


@@ -31,6 +31,7 @@ SRCS+=        _setjmp.s alloca.s fabs.s frexp.c insque.c ldexp.c modf.s remque.c \
        setjmp.s
 SRCS+= divsi3.s fixdfsi.s fixunsdfsi.s udivsi3.s
 .elif (${MACHINE} == "tahoe")
        setjmp.s
 SRCS+= divsi3.s fixdfsi.s fixunsdfsi.s udivsi3.s
 .elif (${MACHINE} == "tahoe")

+CFLAGS+=-I/sys

 SRCS+= _setjmp.s alloca.s fabs.s frexp.c insque.s ldexp.s modf.s remque.s \
        setjmp.s
 SRCS+= udiv.s urem.s
 SRCS+= _setjmp.s alloca.s fabs.s frexp.c insque.s ldexp.s modf.s remque.s \
        setjmp.s
 SRCS+= udiv.s urem.s

diff --git a/usr/src/lib/libc/tahoe/gen/ldexp.s b/usr/src/lib/libc/tahoe/gen/ldexp.s
index b1b0c20..4ba7f23 100644 (file)
--- a/usr/src/lib/libc/tahoe/gen/ldexp.s
+++ b/usr/src/lib/libc/tahoe/gen/ldexp.s
@@ -9,7 +9,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-       .asciz "@(#)ldexp.s     5.2 (Berkeley) %G%"
+       .asciz "@(#)ldexp.s     5.3 (Berkeley) %G%"

 #endif /* LIBC_SCCS and not lint */
 
 /*
 #endif /* LIBC_SCCS and not lint */
 
 /*


@@ -35,7 +35,7 @@
  * #include <errno.h>
  */
 #define        ERANGE  34
  * #include <errno.h>
  */
 #define        ERANGE  34

-#include <tahoemath/fp.h>
+#include <tahoe/math/fp.h>

 
 #include "DEFS.h"
 
 
 #include "DEFS.h"
 

diff --git a/usr/src/sbin/fsck/Makefile b/usr/src/sbin/fsck/Makefile
index a1aca96..f3e2689 100644 (file)
--- a/usr/src/sbin/fsck/Makefile
+++ b/usr/src/sbin/fsck/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.15 (Berkeley) %G%
+#      @(#)Makefile    5.16 (Berkeley) %G%

 
 PROG=  fsck
 MAN8=  fsck.0
 
 PROG=  fsck
 MAN8=  fsck.0

diff --git a/usr/src/usr.bin/showmount/Makefile b/usr/src/usr.bin/showmount/Makefile
index c57db86..1cc6ed2 100644 (file)
--- a/usr/src/usr.bin/showmount/Makefile
+++ b/usr/src/usr.bin/showmount/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    6.2 (Berkeley) %G%
+#      @(#)Makefile    6.3 (Berkeley) %G%

 
 PROG=  showmount
 DPADD= ${LIBRPC}
 
 PROG=  showmount
 DPADD= ${LIBRPC}

diff --git a/usr/src/usr.bin/systat/Makefile b/usr/src/usr.bin/systat/Makefile
index 28c753d..a4632b3 100644 (file)
--- a/usr/src/usr.bin/systat/Makefile
+++ b/usr/src/usr.bin/systat/Makefile
@@ -1,6 +1,7 @@
-#      @(#)Makefile    5.7 (Berkeley) %G%
+#      @(#)Makefile    5.8 (Berkeley) %G%

 
 PROG=  systat
 
 PROG=  systat

+CFLAGS+=-I/sys

 SRCS=  cmds.c cmdtab.c disks.c fetch.c iostat.c keyboard.c vmstat.c main.c \
        mbufs.c netcmds.c netstat.c pigs.c swap.c
 LDADD= -lcurses -ltermcap -lm -lutil
 SRCS=  cmds.c cmdtab.c disks.c fetch.c iostat.c keyboard.c vmstat.c main.c \
        mbufs.c netcmds.c netstat.c pigs.c swap.c
 LDADD= -lcurses -ltermcap -lm -lutil

diff --git a/usr/src/usr.bin/systat/disks.c b/usr/src/usr.bin/systat/disks.c
index dec6119..7d34102 100644 (file)
--- a/usr/src/usr.bin/systat/disks.c
+++ b/usr/src/usr.bin/systat/disks.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)disks.c    5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)disks.c    5.6 (Berkeley) %G%";

 #endif not lint
 
 #include "systat.h"
 #endif not lint
 
 #include "systat.h"


@@ -189,7 +189,7 @@ read_names()
 #endif
 
 #ifdef tahoe
 #endif
 
 #ifdef tahoe

-#include <tahoevba/vbavar.h>
+#include <tahoe/vba/vbavar.h>

 
 /*
  * Read the drive names out of kmem.
 
 /*
  * Read the drive names out of kmem.

diff --git a/usr/src/usr.bin/uucp/uucico/tio.c b/usr/src/usr.bin/uucp/uucico/tio.c
index d74f81f..cfdb26b 100644 (file)
--- a/usr/src/usr.bin/uucp/uucico/tio.c
+++ b/usr/src/usr.bin/uucp/uucico/tio.c
@@ -1,12 +1,12 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)tio.c      4.9     (Berkeley) %G%";
+static char sccsid[] = "@(#)tio.c      4.10    (Berkeley) %G%";

 #endif
 
 #endif
 

-#include <signal.h>
+#include <sys/param.h>
+#include <sys/signal.h>
+#include <sys/stat.h>

 #include "uucp.h"
 #include <setjmp.h>
 #include "uucp.h"
 #include <setjmp.h>

-#include <sys/stat.h>
-#include <machine/machparam.h>

 
 extern int pkfail();
 #define TPACKSIZE      512
 
 extern int pkfail();
 #define TPACKSIZE      512

diff --git a/usr/src/usr.bin/vmstat/Makefile b/usr/src/usr.bin/vmstat/Makefile
index 33e327d..75fef4e 100644 (file)
--- a/usr/src/usr.bin/vmstat/Makefile
+++ b/usr/src/usr.bin/vmstat/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.5 (Berkeley) %G%

 
 PROG=  vmstat
 BINGRP=        kmem
 
 PROG=  vmstat
 BINGRP=        kmem

diff --git a/usr/src/usr.bin/w/Makefile b/usr/src/usr.bin/w/Makefile
index 2de139e..6175d35 100644 (file)
--- a/usr/src/usr.bin/w/Makefile
+++ b/usr/src/usr.bin/w/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.5 (Berkeley) %G%

 
 PROG=  w
 SRCS=  w.c attime.c proc_compare.c
 
 PROG=  w
 SRCS=  w.c attime.c proc_compare.c

diff --git a/usr/src/usr.sbin/edquota/Makefile b/usr/src/usr.sbin/edquota/Makefile
index dcdec15..61e2125 100644 (file)
--- a/usr/src/usr.sbin/edquota/Makefile
+++ b/usr/src/usr.sbin/edquota/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.3 (Berkeley) %G%
+#      @(#)Makefile    5.4 (Berkeley) %G%

 
 PROG=  edquota
 MAN8=  edquota.0
 
 PROG=  edquota
 MAN8=  edquota.0

diff --git a/usr/src/usr.sbin/iostat/Makefile b/usr/src/usr.sbin/iostat/Makefile
index daccb9e..a142aaa 100644 (file)
--- a/usr/src/usr.sbin/iostat/Makefile
+++ b/usr/src/usr.sbin/iostat/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.5 (Berkeley) %G%

 
 PROG=  iostat
 MAN8=  iostat.0
 
 PROG=  iostat
 MAN8=  iostat.0

diff --git a/usr/src/usr.sbin/iostat/iostat.c b/usr/src/usr.sbin/iostat/iostat.c
index 98d655f..eaf3264 100644 (file)
--- a/usr/src/usr.sbin/iostat/iostat.c
+++ b/usr/src/usr.sbin/iostat/iostat.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)iostat.c    4.17 (Berkeley) 89/05/29";
+static char *sccsid = "@(#)iostat.c    4.18 (Berkeley) 91/01/14";

 #endif
 
 /*
 #endif
 
 /*


@@ -329,7 +329,7 @@ read_names()
 #endif
 
 #ifdef tahoe
 #endif
 
 #ifdef tahoe

-#include <tahoevba/vbavar.h>
+#include <tahoe/vba/vbavar.h>

 
 /*
  * Read the drive names out of kmem.
 
 /*
  * Read the drive names out of kmem.

diff --git a/usr/src/usr.sbin/mkproto/Makefile b/usr/src/usr.sbin/mkproto/Makefile
index 0820056..6387cf2 100644 (file)
--- a/usr/src/usr.sbin/mkproto/Makefile
+++ b/usr/src/usr.sbin/mkproto/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.3 (Berkeley) %G%
+#      @(#)Makefile    5.4 (Berkeley) %G%

 
 PROG=  mkproto
 MAN8=  mkproto.0
 
 PROG=  mkproto
 MAN8=  mkproto.0

diff --git a/usr/src/usr.sbin/pstat/Makefile b/usr/src/usr.sbin/pstat/Makefile
index c3ccdab..1515976 100644 (file)
--- a/usr/src/usr.sbin/pstat/Makefile
+++ b/usr/src/usr.sbin/pstat/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.3 (Berkeley) %G%
+#      @(#)Makefile    5.4 (Berkeley) %G%

 
 PROG=  pstat
 SRCS=  pstat.c devname.c
 
 PROG=  pstat
 SRCS=  pstat.c devname.c

diff --git a/usr/src/usr.sbin/quot/Makefile b/usr/src/usr.sbin/quot/Makefile
index b69622f..0b79a38 100644 (file)
--- a/usr/src/usr.sbin/quot/Makefile
+++ b/usr/src/usr.sbin/quot/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.4 (Berkeley) %G%
+#      @(#)Makefile    5.5 (Berkeley) %G%

 
 PROG=  quot
 DPADD= ${LIBUTIL}
 
 PROG=  quot
 DPADD= ${LIBUTIL}

diff --git a/usr/src/usr.sbin/quotaon/Makefile b/usr/src/usr.sbin/quotaon/Makefile
index d68d1c5..0f2ec1f 100644 (file)
--- a/usr/src/usr.sbin/quotaon/Makefile
+++ b/usr/src/usr.sbin/quotaon/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.3 (Berkeley) %G%
+#      @(#)Makefile    5.4 (Berkeley) %G%

 
 PROG=  quotaon
 MAN8=  quotaon.0
 
 PROG=  quotaon
 MAN8=  quotaon.0

diff --git a/usr/src/usr.sbin/repquota/Makefile b/usr/src/usr.sbin/repquota/Makefile
index 308bf39..d78f546 100644 (file)
--- a/usr/src/usr.sbin/repquota/Makefile
+++ b/usr/src/usr.sbin/repquota/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.3 (Berkeley) %G%
+#      @(#)Makefile    5.4 (Berkeley) %G%

 
 PROG=  repquota
 MAN8=  repquota.0
 
 PROG=  repquota
 MAN8=  repquota.0