Cleanup

5 files changed, 0 insertions, 1451 deletions

diff --git a/dev-util/strace/files/digest-strace-3.99 b/dev-util/strace/files/digest-strace-3.99
deleted file mode 100644
index cab6dd93e58b..000000000000
--- a/dev-util/strace/files/digest-strace-3.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c53dccb55179de2ab058443f1b446796 strace-3.99.tar.gz
diff --git a/dev-util/strace/files/digest-strace-4.2-r2 b/dev-util/strace/files/digest-strace-4.2-r2
deleted file mode 100644
index a5694effe782..000000000000
--- a/dev-util/strace/files/digest-strace-4.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4702419bfccbc025b9f10141bcf1ee9a strace-4.2.tar.gz
diff --git a/dev-util/strace/files/ipc.c b/dev-util/strace/files/ipc.c
deleted file mode 100644
index 58591e6109dd..000000000000
--- a/dev-util/strace/files/ipc.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * Copyright (c) 1993 Ulrich Pegelow <pegelow@moorea.uni-muenster.de>
- * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
- * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: ipc.c,v 1.1 2000/11/27 15:59:32 achim Exp $
- */
-
-#include "defs.h"
-
-#if defined(LINUX) || defined(SUNOS4)
-
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/msg.h>
-#include <sys/shm.h>
-
-#ifndef MSG_STAT
-#define MSG_STAT 11
-#endif
-#ifndef MSG_INFO
-#define MSG_INFO 12
-#endif
-#ifndef SHM_STAT
-#define SHM_STAT 13
-#endif
-#ifndef SHM_INFO
-#define SHM_INFO 14
-#endif
-#ifndef SEM_STAT
-#define SEM_STAT 18
-#endif
-#ifndef SEM_INFO
-#define SEM_INFO 19
-#endif
-#ifndef IPC_INFO
-#define IPC_INFO 3
-#endif
-#ifndef MSG_EXCEPT
-#define MSG_EXCEPT 020000
-#endif
-static struct xlat msgctl_flags[] = {
-	{ IPC_RMID,	"IPC_RMID"	},
-	{ IPC_SET,	"IPC_SET"	},
-	{ IPC_STAT,	"IPC_STAT"	},
-#ifdef LINUX
-	{ IPC_INFO,	"IPC_INFO"	},
-	{ MSG_STAT,	"MSG_STAT"	},
-	{ MSG_INFO,	"MSG_INFO"	},
-#endif /* LINUX */
-	{ 0,		NULL		},
-};
-
-static struct xlat semctl_flags[] = {
-	{ IPC_RMID,	"IPC_RMID"	},
-	{ IPC_SET,	"IPC_SET"	},
-	{ IPC_STAT,	"IPC_STAT"	},
-#ifdef LINUX
-	{ IPC_INFO,	"IPC_INFO"	},
-	{ SEM_STAT,	"SEM_STAT"	},
-	{ SEM_INFO,	"SEM_INFO"	},
-#endif /* LINUX */
-	{ GETPID,	"GETPID"	},
-	{ GETVAL,	"GETVAL"	},
-	{ GETALL,	"GETALL"	},
-	{ GETNCNT,	"GETNCNT"	},
-	{ GETZCNT,	"GETZCNT"	},
-	{ SETVAL,	"SETVAL"	},
-	{ SETALL,	"SETALL"	},
-	{ 0,		NULL		},
-};
-
-static struct xlat shmctl_flags[] = {
-	{ IPC_RMID,	"IPC_RMID"	},
-	{ IPC_SET,	"IPC_SET"	},
-	{ IPC_STAT,	"IPC_STAT"	},
-#ifdef LINUX
-	{ IPC_INFO,	"IPC_INFO"	},
-	{ SHM_STAT,	"SHM_STAT"	},
-	{ SHM_INFO,	"SHM_INFO"	},
-#endif /* LINUX */
-	{ SHM_LOCK,	"SHM_LOCK"	},
-	{ SHM_UNLOCK,	"SHM_UNLOCK"	},
-	{ 0,		NULL		},
-};
-
-static struct xlat resource_flags[] = {
-	{ IPC_CREAT,	"IPC_CREAT"	},
-	{ IPC_EXCL,	"IPC_EXCL"	},
-	{ IPC_NOWAIT,	"IPC_NOWAIT"	},
-	{ 0,		NULL		},
-};
-
-static struct xlat shm_flags[] = {
-#ifdef LINUX
-	{ SHM_REMAP,	"SHM_REMAP"	},
-#endif /* LINUX */
-	{ SHM_RDONLY,	"SHM_RDONLY"	},
-	{ SHM_RND,	"SHM_RND"	},
-	{ 0,		NULL		},
-};
-
-static struct xlat msg_flags[] = {
-	{ MSG_NOERROR,	"MSG_NOERROR"	},
-#ifdef LINUX
-	{ MSG_EXCEPT,	"MSG_EXCEPT"	},
-#endif /* LINUX */
-	{ IPC_NOWAIT,	"IPC_NOWAIT"	},
-	{ 0,		NULL		},
-};
-
-int sys_msgget(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		if (tcp->u_arg[0])
-			tprintf("%lu", tcp->u_arg[0]);
-		else
-			tprintf("IPC_PRIVATE");
-		tprintf(", ");
-		if (printflags(resource_flags, tcp->u_arg[1]) != 0)
-			tprintf("|");
-		tprintf("%#lo", tcp->u_arg[1] & 0666);
-	}
-	return 0;
-}
-
-int sys_msgctl(tcp)
-struct tcb *tcp;
-{
-	char *cmd = xlookup(msgctl_flags, tcp->u_arg[1]);
-
-	if (entering(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-		tprintf(", %s", cmd == NULL ? "MSG_???" : cmd);
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[2]);
-#endif /* !LINUX */
-	}
-	return 0;
-}
-
-int sys_msgsnd(tcp)
-struct tcb *tcp;
-{
-	long mtype;
-
-	if (entering(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		umove(tcp, tcp->u_arg[3], &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, tcp->u_arg[3] + sizeof(long),
-			tcp->u_arg[1]);
-		tprintf("}, %lu", tcp->u_arg[1]);
-		tprintf(", ");
-		if (printflags(msg_flags, tcp->u_arg[2]) == 0)
-			tprintf("0");
-#else /* !LINUX */
-		umove(tcp, tcp->u_arg[1], &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, tcp->u_arg[1] + sizeof(long),
-			tcp->u_arg[2]);
-		tprintf("}, %lu", tcp->u_arg[2]);
-		tprintf(", ");
-		if (printflags(msg_flags, tcp->u_arg[3]) == 0)
-			tprintf("0");
-#endif /* !LINUX */
-	}
-	return 0;
-}
-
-int sys_msgrcv(tcp)
-struct tcb *tcp;
-{
-	long mtype;
-#ifdef LINUX
-	struct ipc_wrapper {
-		struct msgbuf *msgp;
-		long msgtyp;
-	} tmp;
-#endif
-
-
-	if (exiting(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		umove(tcp, tcp->u_arg[3], &tmp);
-		umove(tcp, (long) tmp.msgp, &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, (long) (tmp.msgp) + sizeof(long),
-			tcp->u_arg[1]);
-		tprintf("}, %lu", tcp->u_arg[1]);
-		tprintf(", %ld", tmp.msgtyp);
-		tprintf(", ");
-		if (printflags(msg_flags, tcp->u_arg[2]) == 0)
-			tprintf("0");
-#else /* !LINUX */
-		umove(tcp, tcp->u_arg[1], &mtype);
-		tprintf(", {%lu, ", mtype);
-		printstr(tcp, tcp->u_arg[1] + sizeof(long),
-			tcp->u_arg[2]);
-		tprintf("}, %lu", tcp->u_arg[2]);
-		tprintf(", %ld", tcp->u_arg[3]);
-		tprintf(", ");
-		if (printflags(msg_flags, tcp->u_arg[4]) == 0)
-			tprintf("0");
-#endif /* !LINUX */
-	}
-	return 0;
-}
-
-int sys_semop(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-		tprintf(", %lu", tcp->u_arg[1]);
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[1]);
-		tprintf(", %lu", tcp->u_arg[2]);
-#endif /* !LINUX */
-	}
-	return 0;
-}
-
-int sys_semget(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		if (tcp->u_arg[0])
-			tprintf("%lu", tcp->u_arg[0]);
-		else
-			tprintf("IPC_PRIVATE");
-		tprintf(", %lu", tcp->u_arg[1]);
-		tprintf(", ");
-		if (printflags(resource_flags, tcp->u_arg[2]) != 0)
-			tprintf("|");
-		tprintf("%#lo", tcp->u_arg[2] & 0666);
-	}
-	return 0;
-}
-
-int sys_semctl(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-		tprintf(", %lu, ", tcp->u_arg[1]);
-		printxval(semctl_flags, tcp->u_arg[2], "SEM_???");
-		tprintf(", %#lx", tcp->u_arg[3]);
-	}
-	return 0;
-}
-
-int sys_shmget(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		if (tcp->u_arg[0])
-			tprintf("%lu", tcp->u_arg[0]);
-		else
-			tprintf("IPC_PRIVATE");
-		tprintf(", %lu", tcp->u_arg[1]);
-		tprintf(", ");
-		if (printflags(resource_flags, tcp->u_arg[2]) != 0)
-			tprintf("|");
-		tprintf("%#lo", tcp->u_arg[2] & 0666);
-	}
-	return 0;
-}
-
-int sys_shmctl(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
-		printxval(shmctl_flags, tcp->u_arg[1], "SHM_???");
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[2]);
-#endif /* !LINUX */
-	}
-	return 0;
-}
-
-int sys_shmat(tcp)
-struct tcb *tcp;
-{
-#ifdef LINUX
-	unsigned long raddr;
-#endif /* LINUX */
-
-	if (exiting(tcp)) {
-		tprintf("%lu", tcp->u_arg[0]);
-#ifdef LINUX
-		tprintf(", %#lx", tcp->u_arg[3]);
-		tprintf(", ");
-		if (printflags(shm_flags, tcp->u_arg[1]) == 0)
-			tprintf("0");
-#else /* !LINUX */
-		tprintf(", %#lx", tcp->u_arg[1]);
-		tprintf(", ");
-		if (printflags(shm_flags, tcp->u_arg[2]) == 0)
-			tprintf("0");
-#endif /* !LINUX */
-		if (syserror(tcp))
-			return 0;
-#ifdef LINUX
-		if (umove(tcp, tcp->u_arg[2], &raddr) < 0)
-			return RVAL_NONE;
-		tcp->u_rval = raddr;
-#endif /* LINUX */
-		return RVAL_HEX;
-	}
-	return 0;
-}
-
-int sys_shmdt(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp))
-#ifdef LINUX
-		tprintf("%#lx", tcp->u_arg[3]);
-#else /* !LINUX */
-		tprintf("%#lx", tcp->u_arg[0]);
-#endif /* !LINUX */
-	return 0;
-}
-
-#endif /* defined(LINUX) || defined(SUNOS4) */
diff --git a/dev-util/strace/files/stream.c b/dev-util/strace/files/stream.c
deleted file mode 100644
index 4741e5b4be18..000000000000
--- a/dev-util/strace/files/stream.c
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: stream.c,v 1.2 2000/11/27 15:59:32 achim Exp $
- */
-
-#include "defs.h"
-
-#if defined(HAVE_SYS_STREAM_H) || defined(linux)
-
-#if defined(linux)
-#include <sys/poll.h>
-#include <stropts.h>
-
-#define MORECTL 1
-#define MOREDATA 2
-
-#else /* linux */
-
-#include <stropts.h>
-#include <poll.h>
-#include <sys/conf.h>
-#include <sys/stream.h>
-#include <sys/tihdr.h>
-
-#endif /* linux */
-
-#ifdef HAVE_SYS_TIUSER_H
-#include <sys/tiuser.h>
-#include <sys/sockmod.h>
-#include <sys/timod.h>
-#endif /* HAVE_SYS_TIUSER_H */
-
-static struct xlat msgflags[] = {
-	{ RS_HIPRI,	"RS_HIPRI"	},
-	{ 0,		NULL		},
-};
-
-
-static void
-printstrbuf(tcp, sbp, getting)
-struct tcb *tcp;
-struct strbuf *sbp;
-int getting;
-{
-	if (sbp->maxlen == -1 && getting)
-		tprintf("{maxlen=-1}");
-	else {
-		tprintf("{");
-		if (getting)
-			tprintf("maxlen=%d, ", sbp->maxlen);
-		tprintf("len=%d, buf=", sbp->len);
-		printstr(tcp, (int) sbp->buf, sbp->len);
-		tprintf("}");
-	}
-}
-
-static void
-printstrbufarg(tcp, arg, getting)
-struct tcb *tcp;
-int arg;
-int getting;
-{
-	struct strbuf buf;
-
-	if (arg == 0)
-		tprintf("NULL");
-	else if (umove(tcp, arg, &buf) < 0)
-		tprintf("{...}");
-	else
-		printstrbuf(tcp, &buf, getting);
-	tprintf(", ");
-}
-
-int
-sys_putmsg(tcp)
-struct tcb *tcp;
-{
-	int i;
-
-	if (entering(tcp)) {
-		/* fd */
-		tprintf("%ld, ", tcp->u_arg[0]);
-		/* control and data */
-		for (i = 1; i < 3; i++)
-			printstrbufarg(tcp, tcp->u_arg[i], 0);
-		/* flags */
-		if (!printflags(msgflags, tcp->u_arg[3]))
-			tprintf("0");
-	}
-	return 0;
-}
-
-int
-sys_getmsg(tcp)
-struct tcb *tcp;
-{
-	int i, flags;
-
-	if (entering(tcp)) {
-		/* fd */
-		tprintf("%lu, ", tcp->u_arg[0]);
-	} else {
-		if (syserror(tcp)) {
-			tprintf("%#lx, %#lx, %#lx",
-				tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
-			return 0;
-		}
-		/* control and data */
-		for (i = 1; i < 3; i++)
-			printstrbufarg(tcp, tcp->u_arg[i], 1);
-		/* pointer to flags */
-		if (tcp->u_arg[3] == 0)
-			tprintf("NULL");
-		else if (umove(tcp, tcp->u_arg[3], &flags) < 0)
-			tprintf("[?]");
-		else {
-			tprintf("[");
-			if (!printflags(msgflags, flags))
-				tprintf("0");
-			tprintf("]");
-		}
-		/* decode return value */
-		switch (tcp->u_rval) {
-		case MORECTL:
-			tcp->auxstr = "MORECTL";
-			break;
-		case MORECTL|MOREDATA:
-			tcp->auxstr = "MORECTL|MOREDATA";
-			break;
-		case MOREDATA:
-			tcp->auxstr = "MORECTL";
-			break;
-		default:
-			tcp->auxstr = NULL;
-			break;
-		}
-	}
-	return RVAL_HEX | RVAL_STR;
-}
-
-#ifdef HAVE_PUTPMSG
-
-static struct xlat pmsgflags[] = {
-	{ MSG_HIPRI,	"MSG_HIPRI"	},
-	{ MSG_ANY,	"MSG_ANY"	},
-	{ MSG_BAND,	"MSG_BAND"	},
-	{ 0,		NULL		},
-};
-
-int
-sys_putpmsg(tcp)
-struct tcb *tcp;
-{
-	int i;
-
-	if (entering(tcp)) {
-		/* fd */
-		tprintf("%ld, ", tcp->u_arg[0]);
-		/* control and data */
-		for (i = 1; i < 3; i++)
-			printstrbufarg(tcp, tcp->u_arg[i], 0);
-		/* band */
-		tprintf("%ld, ", tcp->u_arg[3]);
-		/* flags */
-		if (!printflags(pmsgflags, tcp->u_arg[4]))
-			tprintf("0");
-	}
-	return 0;
-}
-
-int
-sys_getpmsg(tcp)
-struct tcb *tcp;
-{
-	int i, flags;
-
-	if (entering(tcp)) {
-		/* fd */
-		tprintf("%lu, ", tcp->u_arg[0]);
-	} else {
-		if (syserror(tcp)) {
-			tprintf("%#lx, %#lx, %#lx, %#lx", tcp->u_arg[1],
-				tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[4]);
-			return 0;
-		}
-		/* control and data */
-		for (i = 1; i < 3; i++)
-			printstrbufarg(tcp, tcp->u_arg[i], 1);
-		/* pointer to band */
-		printnum(tcp, tcp->u_arg[3], "%d");
-		/* pointer to flags */
-		if (tcp->u_arg[4] == 0)
-			tprintf("NULL");
-		else if (umove(tcp, tcp->u_arg[4], &flags) < 0)
-			tprintf("[?]");
-		else {
-			tprintf("[");
-			if (!printflags(pmsgflags, flags))
-				tprintf("0");
-			tprintf("]");
-		}
-		/* decode return value */
-		switch (tcp->u_rval) {
-		case MORECTL:
-			tcp->auxstr = "MORECTL";
-			break;
-		case MORECTL|MOREDATA:
-			tcp->auxstr = "MORECTL|MOREDATA";
-			break;
-		case MOREDATA:
-			tcp->auxstr = "MORECTL";
-			break;
-		default:
-			tcp->auxstr = NULL;
-			break;
-		}
-	}
-	return RVAL_HEX | RVAL_STR;
-}
-
-#endif /* HAVE_PUTPMSG */
-
-
-static struct xlat pollflags[] = {
-	{ POLLIN,	"POLLIN"	},
-	{ POLLPRI,	"POLLPRI"	},
-	{ POLLOUT,	"POLLOUT"	},
-#ifdef POLLRDNORM
-	{ POLLRDNORM,	"POLLRDNORM"	},
-#endif
-#ifdef POLLWRNORM
-	{ POLLWRNORM,	"POLLWRNORM"	},
-#endif
-#ifdef POLLRDBAND
-	{ POLLRDBAND,	"POLLRDBAND"	},
-#endif
-#ifdef POLLWRBAND
-	{ POLLWRBAND,	"POLLWRBAND"	},
-#endif
-	{ POLLERR,	"POLLERR"	},
-	{ POLLHUP,	"POLLHUP"	},
-	{ POLLNVAL,	"POLLNVAL"	},
-	{ 0,		NULL		},
-};
-
-int
-sys_poll(tcp)
-struct tcb *tcp;
-{
-	struct pollfd *pollp;
-
-	if (exiting(tcp)) {
-		int i;
-		int nfds = tcp->u_arg[1];
-
-		if (nfds <= 0) {
-			tprintf("%#lx, %d, %ld\n",
-				tcp->u_arg[0], nfds, tcp->u_arg[2]);
-			return 0;
-		}
-		pollp = (struct pollfd *) malloc(nfds * sizeof(*pollp));
-		if (pollp == NULL) {
-			fprintf(stderr, "sys_poll: no memory\n");
-			tprintf("%#lx, %d, %ld",
-				tcp->u_arg[0], nfds, tcp->u_arg[2]);
-			return 0;
-		}
-		if (umoven(tcp, tcp->u_arg[0],
-			   (nfds * sizeof(*pollp)), (char *) pollp) < 0) {
-			tprintf("%#lx", tcp->u_arg[0]);
-		}
-		else {
-			tprintf("[");
-			for (i = 0; i < nfds; i++) {
-				if (i)
-					tprintf(", ");
-				if (pollp[i].fd < 0) {
-					tprintf("{fd=%d}", pollp[i].fd);
-					continue;
-				}
-				tprintf("{fd=%d, events=", pollp[i].fd);
-				if (!printflags(pollflags, pollp[i].events))
-					tprintf("0");
-				if (!syserror(tcp) && pollp[i].revents) {
-					tprintf(", revents=");
-					if (!printflags(pollflags,
-							pollp[i].revents))
-						tprintf("0");
-				}
-				tprintf("}");
-			}
-			tprintf("]");
-		}
-		tprintf(", %d, ", nfds);
-#ifdef INFTIM
-		if (tcp->u_arg[2] == INFTIM)
-			tprintf("INFTIM");
-		else
-#endif
-			tprintf("%ld", tcp->u_arg[2]);
-		free(pollp);
-	}
-	return 0;
-}
-
-#ifndef linux
-
-static struct xlat stream_flush_options[] = {
-	{ FLUSHR,	"FLUSHR"	},
-	{ FLUSHW,	"FLUSHW"	},
-	{ FLUSHRW,	"FLUSHRW"	},
-#ifdef FLUSHBAND
-	{ FLUSHBAND,	"FLUSHBAND"	},
-#endif
-	{ 0,		NULL		},
-};
-
-static struct xlat stream_setsig_flags[] = {
-	{ S_INPUT,	"S_INPUT"	},
-	{ S_HIPRI,	"S_HIPRI"	},
-	{ S_OUTPUT,	"S_OUTPUT"	},
-	{ S_MSG,	"S_MSG"		},
-#ifdef S_ERROR
-	{ S_ERROR,	"S_ERROR"	},
-#endif
-#ifdef S_HANGUP
-	{ S_HANGUP,	"S_HANGUP"	},
-#endif
-#ifdef S_RDNORM
-	{ S_RDNORM,	"S_RDNORM"	},
-#endif
-#ifdef S_WRNORM
-	{ S_WRNORM,	"S_WRNORM"	},
-#endif
-#ifdef S_RDBAND
-	{ S_RDBAND,	"S_RDBAND"	},
-#endif
-#ifdef S_WRBAND
-	{ S_WRBAND,	"S_WRBAND"	},
-#endif
-#ifdef S_BANDURG
-	{ S_BANDURG,	"S_BANDURG"	},
-#endif
-	{ 0,		NULL		},
-};
-
-static struct xlat stream_read_options[] = {
-	{ RNORM,	"RNORM"		},
-	{ RMSGD,	"RMSGD"		},
-	{ RMSGN,	"RMSGN"		},
-	{ 0,		NULL		},
-};
-
-static struct xlat stream_read_flags[] = {
-#ifdef RPROTDAT
-	{ RPROTDAT,	"RPROTDAT"	},
-#endif
-#ifdef RPROTDIS
-	{ RPROTDIS,	"RPROTDIS"	},
-#endif
-#ifdef RPROTNORM
-	{ RPROTNORM,	"RPROTNORM"	},
-#endif
-	{ 0,		NULL		},
-};
-
-#ifndef RMODEMASK
-#define RMODEMASK (~0)
-#endif
-
-#ifdef I_SWROPT
-static struct xlat stream_write_flags[] = {
-	{ SNDZERO,	"SNDZERO"	},
-	{ SNDPIPE,	"SNDPIPE"	},
-	{ 0,		NULL		},
-};
-#endif /* I_SWROPT */
-
-#ifdef I_ATMARK
-static struct xlat stream_atmark_options[] = {
-	{ ANYMARK,	"ANYMARK"	},
-	{ LASTMARK,	"LASTMARK"	},
-	{ 0,		NULL		},
-};
-#endif /* I_ATMARK */
-
-#ifdef TI_BIND
-static struct xlat transport_user_options[] = {
-	{ T_CONN_REQ,	"T_CONN_REQ"	},
-	{ T_CONN_RES,	"T_CONN_RES"	},
-	{ T_DISCON_REQ,	"T_DISCON_REQ"	},
-	{ T_DATA_REQ,	"T_DATA_REQ"	},
-	{ T_EXDATA_REQ,	"T_EXDATA_REQ"	},
-	{ T_INFO_REQ,	"T_INFO_REQ"	},
-	{ T_BIND_REQ,	"T_BIND_REQ"	},
-	{ T_UNBIND_REQ,	"T_UNBIND_REQ"	},
-	{ T_UNITDATA_REQ,"T_UNITDATA_REQ"},
-	{ T_OPTMGMT_REQ,"T_OPTMGMT_REQ"	},
-	{ T_ORDREL_REQ,	"T_ORDREL_REQ"	},
-	{ 0,		NULL		},
-};
-
-static struct xlat transport_provider_options[] = {
-	{ T_CONN_IND,	"T_CONN_IND"	},
-	{ T_CONN_CON,	"T_CONN_CON"	},
-	{ T_DISCON_IND,	"T_DISCON_IND"	},
-	{ T_DATA_IND,	"T_DATA_IND"	},
-	{ T_EXDATA_IND,	"T_EXDATA_IND"	},
-	{ T_INFO_ACK,	"T_INFO_ACK"	},
-	{ T_BIND_ACK,	"T_BIND_ACK"	},
-	{ T_ERROR_ACK,	"T_ERROR_ACK"	},
-	{ T_OK_ACK,	"T_OK_ACK"	},
-	{ T_UNITDATA_IND,"T_UNITDATA_IND"},
-	{ T_UDERROR_IND,"T_UDERROR_IND"	},
-	{ T_OPTMGMT_ACK,"T_OPTMGMT_ACK"	},
-	{ T_ORDREL_IND,	"T_ORDREL_IND"	},
-	{ 0,		NULL		},
-};
-#endif /* TI_BIND */
-
-static int
-internal_stream_ioctl(tcp, arg)
-struct tcb *tcp;
-int arg;
-{
-	struct strioctl si;
-	char *name;
-	int in_and_out;
-#ifdef SI_GETUDATA
-	struct si_udata udata;
-#endif /* SI_GETUDATA */
-
-	if (!arg)
-		return 0;
-	if (umove(tcp, arg, &si) < 0) {
-		if (entering(tcp))
-			tprintf(", {...}");
-		return 1;
-	}
-	if (entering(tcp)) {
-		name = ioctl_lookup(si.ic_cmd);
-		if (name)
-			tprintf(", {ic_cmd=%s", name);
-		else
-			tprintf(", {ic_cmd=%#x", si.ic_cmd);
-		if (si.ic_timout == INFTIM)
-			tprintf(", ic_timout=INFTIM, ");
-		else
-			tprintf(" ic_timout=%d, ", si.ic_timout);
-	}
-	in_and_out = 1;
-	switch (si.ic_cmd) {
-#ifdef SI_GETUDATA
-	case SI_GETUDATA:
-		in_and_out = 0;
-		break;
-#endif /* SI_GETUDATA */
-	}
-	if (in_and_out) {
-		if (entering(tcp))
-			tprintf("/* in */ ");
-		else
-			tprintf(", /* out */ ");
-	}
-	if (in_and_out || entering(tcp))
-		tprintf("ic_len=%d, ic_dp=", si.ic_len);
-	switch (si.ic_cmd) {
-#ifdef TI_BIND
-	case TI_BIND:
-		/* in T_BIND_REQ, out T_BIND_ACK */
-		if (entering(tcp)) {
-			struct T_bind_req data;
-
-#if 0
-			tprintf("struct T_bind_req ");
-#endif
-			if (umove(tcp, (int) si.ic_dp, &data) < 0)
-				tprintf("{...}");
-			else {
-				tprintf("{PRIM_type=");
-				printxval(transport_user_options,
-					  data.PRIM_type, "T_???");
-				tprintf(", ADDR_length=%ld, ADDR_offset=%ld",
-					data.ADDR_length, data.ADDR_offset);
-				tprintf(", CONIND_number=%ld}",
-					data.CONIND_number);
-			}
-		}
-		else {
-			struct T_bind_ack data;
-
-#if 0
-			tprintf("struct T_bind_ack ");
-#endif
-			if (umove(tcp, (int) si.ic_dp, &data) < 0)
-				tprintf("{...}");
-			else {
-				tprintf("[");
-				tprintf("{PRIM_type=");
-				printxval(transport_provider_options,
-					  data.PRIM_type, "T_???");
-				tprintf(", ADDR_length=%ld, ADDR_offset=%ld",
-					data.ADDR_length, data.ADDR_offset);
-				tprintf(", CONIND_number=%ld}",
-					data.CONIND_number);
-				tprintf(", ");
-				printstr(tcp,
-					 (int) si.ic_dp + data.ADDR_offset,
-					 data.ADDR_length);
-				tprintf("]");
-			}
-		}
-		break;
-#endif /* TI_BIND */
-#if 0
-#ifdef TI_UNBIND
-	case TI_UNBIND:
-		/* in T_UNBIND_REQ, out T_OK_ACK */
-		break;
-#endif /* TI_UNBIND */
-#ifdef TI_GETINFO
-	case TI_GETINFO:
-		/* in T_INFO_REQ, out T_INFO_ACK */
-		break;
-#endif /* TI_GETINFO */
-#ifdef TI_OPTMGMT
-	case TI_OPTMGMT:
-		/* in T_OPTMGMT_REQ, out T_OPTMGMT_ACK */
-		break;
-#endif /* TI_OPTMGMT */
-#endif
-#ifdef SI_GETUDATA
-	case SI_GETUDATA:
-		if (entering(tcp))
-			break;
-#if 0
-		tprintf("struct si_udata ");
-#endif
-		if (umove(tcp, (int) si.ic_dp, &udata) < 0)
-			tprintf("{...}");
-		else {
-			tprintf("{tidusize=%d, addrsize=%d, ",
-				udata.tidusize, udata.addrsize);
-			tprintf("optsize=%d, etsdusize=%d, ",
-				udata.optsize, udata.etsdusize);
-			tprintf("servtype=%d, so_state=%d, ",
-				udata.servtype, udata.so_state);
-			tprintf("so_options=%d", udata.so_options);
-#if 0
-			tprintf(", tsdusize=%d", udata.tsdusize);
-#endif
-			tprintf("}");
-		}
-		break;
-#endif /* SI_GETUDATA */
-	default:
-		printstr(tcp, (int) si.ic_dp, si.ic_len);
-		break;
-	}
-	if (exiting(tcp))
-		tprintf("}");
-	return 1;
-}
-
-int
-stream_ioctl(tcp, code, arg)
-struct tcb *tcp;
-int code, arg;
-{
-#ifdef I_LIST
-	int i;
-#endif
-	int val;
-#ifdef I_FLUSHBAND
-	struct bandinfo bi;
-#endif
-	struct strpeek sp;
-	struct strfdinsert sfi;
-	struct strrecvfd srf;
-#ifdef I_LIST
-	struct str_list sl;
-#endif
-
-	/* I_STR is a special case because the data is read & written. */
-	if (code == I_STR)
-		return internal_stream_ioctl(tcp, arg);
-	if (entering(tcp))
-		return 0;
-
-	switch (code) {
-	case I_PUSH:
-	case I_LOOK:
-	case I_FIND:
-		/* arg is a string */
-		tprintf(", ");
-		printpath(tcp, arg);
-		return 1;
-	case I_POP:
-		/* doesn't take an argument */
-		return 1;
-	case I_FLUSH:
-		/* argument is an option */
-		tprintf(", ");
-		printxval(stream_flush_options, arg, "FLUSH???");
-		return 1;
-#ifdef I_FLUSHBAND
-	case I_FLUSHBAND:
-		/* argument is a pointer to a bandinfo struct */
-		if (umove(tcp, arg, &bi) < 0)
-			tprintf(", {...}");
-		else {
-			tprintf(", {bi_pri=%d, bi_flag=", bi.bi_pri);
-			if (!printflags(stream_flush_options, bi.bi_flag))
-				tprintf("0");
-			tprintf("}");
-		}
-		return 1;
-#endif /* I_FLUSHBAND */
-	case I_SETSIG:
-		/* argument is a set of flags */
-		tprintf(", ");
-		if (!printflags(stream_setsig_flags, arg))
-			tprintf("0");
-		return 1;
-	case I_GETSIG:
-		/* argument is a pointer to a set of flags */
-		if (syserror(tcp))
-			return 0;
-		tprintf(", [");
-		if (umove(tcp, arg, &val) < 0)
-			tprintf("?");
-		else if (!printflags(stream_setsig_flags, val))
-			tprintf("0");
-		tprintf("]");
-		return 1;
-	case I_PEEK:
-		/* argument is a pointer to a strpeek structure */
-		if (syserror(tcp) || !arg)
-			return 0;
-		if (umove(tcp, arg, &sp) < 0) {
-			tprintf(", {...}");
-			return 1;
-		}
-		tprintf(", {ctlbuf=");
-		printstrbuf(tcp, &sp.ctlbuf, 1);
-		tprintf(", databuf=");
-		printstrbuf(tcp, &sp.databuf, 1);
-		if (!printflags(msgflags, sp.flags))
-			tprintf("0");
-		return 1;
-	case I_SRDOPT:
-		/* argument is an option with flags */
-		tprintf(", ");
-		printxval(stream_read_options, arg & RMODEMASK, "R???");
-		addflags(stream_read_flags, arg & ~RMODEMASK);
-		return 1;
-	case I_GRDOPT:
-		/* argument is an pointer to an option with flags */
-		if (syserror(tcp))
-			return 0;
-		tprintf(", [");
-		if (umove(tcp, arg, &val) < 0)
-			tprintf("?");
-		else {
-			printxval(stream_read_options,
-				  arg & RMODEMASK, "R???");
-			addflags(stream_read_flags, arg & ~RMODEMASK);
-		}
-		tprintf("]");
-		return 1;
-	case I_NREAD:
-#ifdef I_GETBAND
-	case I_GETBAND:
-#endif
-#ifdef I_SETCLTIME
-	case I_SETCLTIME:
-#endif
-#ifdef I_GETCLTIME
-	case I_GETCLTIME:
-#endif
-		/* argument is a pointer to a decimal integer */
-		if (syserror(tcp))
-			return 0;
-		tprintf(", ");
-		printnum(tcp, arg, "%d");
-		return 1;
-	case I_FDINSERT:
-		/* argument is a pointer to a strfdinsert structure */
-		if (syserror(tcp) || !arg)
-			return 0;
-		if (umove(tcp, arg, &sfi) < 0) {
-			tprintf(", {...}");
-			return 1;
-		}
-		tprintf(", {ctlbuf=");
-		printstrbuf(tcp, &sfi.ctlbuf, 1);
-		tprintf(", databuf=");
-		printstrbuf(tcp, &sfi.databuf, 1);
-		if (!printflags(msgflags, sfi.flags))
-			tprintf("0");
-		tprintf(", filedes=%d, offset=%d}", sfi.fildes, sfi.offset);
-		return 1;
-#ifdef I_SWROPT
-	case I_SWROPT:
-		/* argument is a set of flags */
-		tprintf(", ");
-		if (!printflags(stream_write_flags, arg))
-			tprintf("0");
-		return 1;
-#endif /* I_SWROPT */
-#ifdef I_GWROPT
-	case I_GWROPT:
-		/* argument is an pointer to an option with flags */
-		if (syserror(tcp))
-			return 0;
-		tprintf(", [");
-		if (umove(tcp, arg, &val) < 0)
-			tprintf("?");
-		else if (!printflags(stream_write_flags, arg))
-			tprintf("0");
-		tprintf("]");
-		return 1;
-#endif /* I_GWROPT */
-	case I_SENDFD:
-#ifdef I_CKBAND
-	case I_CKBAND:
-#endif
-#ifdef I_CANPUT
-	case I_CANPUT:
-#endif
-	case I_LINK:
-	case I_UNLINK:
-	case I_PLINK:
-	case I_PUNLINK:
-		/* argument is a decimal integer */
-		tprintf(", %d", arg);
-		return 1;
-	case I_RECVFD:
-		/* argument is a pointer to a strrecvfd structure */
-		if (syserror(tcp) || !arg)
-			return 0;
-		if (umove(tcp, arg, &srf) < 0) {
-			tprintf(", {...}");
-			return 1;
-		}
-		tprintf(", {fd=%d, uid=%lu, gid=%lu}", srf.fd,
-			(unsigned long) srf.uid, (unsigned long) srf.gid);
-		return 1;
-#ifdef I_LIST
-	case I_LIST:
-		if (syserror(tcp))
-			return 0;
-		if (arg == 0) {
-			tprintf(", NULL");
-			return 1;
-		}
-		if (umove(tcp, arg, &sl) < 0) {
-			tprintf(", {...}");
-			return 1;
-		}
-		tprintf(", {sl_nmods=%d, sl_modlist=[", sl.sl_nmods);
-		for (i = 0; i < tcp->u_rval; i++) {
-			if (i)
-				tprintf(", ");
-			printpath(tcp, (int) sl.sl_modlist[i].l_name);
-		}
-		tprintf("]}");
-		return 1;
-#endif /* I_LIST */
-#ifdef I_ATMARK
-	case I_ATMARK:
-		tprintf(", ");
-		printxval(stream_atmark_options, arg, "???MARK");
-		return 1;
-#endif /* I_ATMARK */
-	default:
-		return 0;
-	}
-}
-
-#endif /* linux */
-
-#endif /* LINUXSPARC && linux */
-
diff --git a/dev-util/strace/files/timex.h b/dev-util/strace/files/timex.h
deleted file mode 100644
index 8767b9d1dd52..000000000000
--- a/dev-util/strace/files/timex.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*****************************************************************************
- *                                                                           *
- * Copyright (c) David L. Mills 1993                                         *
- *                                                                           *
- * Permission to use, copy, modify, and distribute this software and its     *
- * documentation for any purpose and without fee is hereby granted, provided *
- * that the above copyright notice appears in all copies and that both the   *
- * copyright notice and this permission notice appear in supporting          *
- * documentation, and that the name University of Delaware not be used in    *
- * advertising or publicity pertaining to distribution of the software       *
- * without specific, written prior permission.  The University of Delaware   *
- * makes no representations about the suitability this software for any      *
- * purpose.  It is provided "as is" without express or implied warranty.     *
- *                                                                           *
- *****************************************************************************/
-
-/*
- * Modification history timex.h
- *
- * 29 Dec 97	Russell King
- *	Moved CLOCK_TICK_RATE, CLOCK_TICK_FACTOR and FINETUNE to asm/timex.h
- *	for ARM machines
- *
- *  9 Jan 97    Adrian Sun
- *      Shifted LATCH define to allow access to alpha machines.
- *
- * 26 Sep 94	David L. Mills
- *	Added defines for hybrid phase/frequency-lock loop.
- *
- * 19 Mar 94	David L. Mills
- *	Moved defines from kernel routines to header file and added new
- *	defines for PPS phase-lock loop.
- *
- * 20 Feb 94	David L. Mills
- *	Revised status codes and structures for external clock and PPS
- *	signal discipline.
- *
- * 28 Nov 93	David L. Mills
- *	Adjusted parameters to improve stability and increase poll
- *	interval.
- *
- * 17 Sep 93    David L. Mills
- *      Created file $NTP/include/sys/timex.h
- * 07 Oct 93    Torsten Duwe
- *      Derived linux/timex.h
- * 1995-08-13    Torsten Duwe
- *      kernel PLL updated to 1994-12-13 specs (rfc-1589)
- * 1997-08-30    Ulrich Windl
- *      Added new constant NTP_PHASE_LIMIT
- */
-#ifndef _LINUX_TIMEX_H
-#define _LINUX_TIMEX_H
-
-/*
- * The following defines establish the engineering parameters of the PLL
- * model. The HZ variable establishes the timer interrupt frequency, 100 Hz
- * for the SunOS kernel, 256 Hz for the Ultrix kernel and 1024 Hz for the
- * OSF/1 kernel. The SHIFT_HZ define expresses the same value as the
- * nearest power of two in order to avoid hardware multiply operations.
- */
-#ifdef __alpha__
-# define SHIFT_HZ 10		/* log2(HZ) */
-#else
-# define SHIFT_HZ 7		/* log2(HZ) */
-#endif
-
-/*
- * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
- * for a slightly underdamped convergence characteristic. SHIFT_KH
- * establishes the damping of the FLL and is chosen by wisdom and black
- * art.
- *
- * MAXTC establishes the maximum time constant of the PLL. With the
- * SHIFT_KG and SHIFT_KF values given and a time constant range from
- * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
- * respectively.
- */
-#define SHIFT_KG 6		/* phase factor (shift) */
-#define SHIFT_KF 16		/* PLL frequency factor (shift) */
-#define SHIFT_KH 2		/* FLL frequency factor (shift) */
-#define MAXTC 6			/* maximum time constant (shift) */
-
-/*
- * The SHIFT_SCALE define establishes the decimal point of the time_phase
- * variable which serves as an extension to the low-order bits of the
- * system clock variable. The SHIFT_UPDATE define establishes the decimal
- * point of the time_offset variable which represents the current offset
- * with respect to standard time. The FINEUSEC define represents 1 usec in
- * scaled units.
- *
- * SHIFT_USEC defines the scaling (shift) of the time_freq and
- * time_tolerance variables, which represent the current frequency
- * offset and maximum frequency tolerance.
- *
- * FINEUSEC is 1 us in SHIFT_UPDATE units of the time_phase variable.
- */
-#define SHIFT_SCALE 22		/* phase scale (shift) */
-#define SHIFT_UPDATE (SHIFT_KG + MAXTC) /* time offset scale (shift) */
-#define SHIFT_USEC 16		/* frequency offset scale (shift) */
-#define FINEUSEC (1L << SHIFT_SCALE) /* 1 us in phase units */
-
-#define MAXPHASE 512000L        /* max phase error (us) */
-#define MAXFREQ (512L << SHIFT_USEC)  /* max frequency error (ppm) */
-#define MAXTIME (200L << PPS_AVG) /* max PPS error (jitter) (200 us) */
-#define MINSEC 16L              /* min interval between updates (s) */
-#define MAXSEC 1200L            /* max interval between updates (s) */
-#define	NTP_PHASE_LIMIT	(MAXPHASE << 5)	/* beyond max. dispersion */
-
-/*
- * The following defines are used only if a pulse-per-second (PPS)
- * signal is available and connected via a modem control lead, such as
- * produced by the optional ppsclock feature incorporated in the Sun
- * asynch driver. They establish the design parameters of the frequency-
- * lock loop used to discipline the CPU clock oscillator to the PPS
- * signal.
- *
- * PPS_AVG is the averaging factor for the frequency loop, as well as
- * the time and frequency dispersion.
- *
- * PPS_SHIFT and PPS_SHIFTMAX specify the minimum and maximum
- * calibration intervals, respectively, in seconds as a power of two.
- *
- * PPS_VALID is the maximum interval before the PPS signal is considered
- * invalid and protocol updates used directly instead.
- *
- * MAXGLITCH is the maximum interval before a time offset of more than
- * MAXTIME is believed.
- */
-#define PPS_AVG 2		/* pps averaging constant (shift) */
-#define PPS_SHIFT 2		/* min interval duration (s) (shift) */
-#define PPS_SHIFTMAX 8		/* max interval duration (s) (shift) */
-#define PPS_VALID 120		/* pps signal watchdog max (s) */
-#define MAXGLITCH 30		/* pps signal glitch max (s) */
-
-/*
- * Pick up the architecture specific timex specifications
- */
-#include <asm/timex.h>
-/*
- * Pick up the definition of timeval
- */
-//#include <linux/time.h>
-
-/* LATCH is used in the interval timer and ftape setup. */
-#define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
-
-/*
- * syscall interface - used (mainly by NTP daemon)
- * to discipline kernel clock oscillator
- */
-struct timex {
-	unsigned int modes;	/* mode selector */
-	long offset;		/* time offset (usec) */
-	long freq;		/* frequency offset (scaled ppm) */
-	long maxerror;		/* maximum error (usec) */
-	long esterror;		/* estimated error (usec) */
-	int status;		/* clock command/status */
-	long constant;		/* pll time constant */
-	long precision;		/* clock precision (usec) (read only) */
-	long tolerance;		/* clock frequency tolerance (ppm)
-				 * (read only)
-				 */
-	struct timeval time;	/* (read only) */
-	long tick;		/* (modified) usecs between clock ticks */
-
-	long ppsfreq;           /* pps frequency (scaled ppm) (ro) */
-	long jitter;            /* pps jitter (us) (ro) */
-	int shift;              /* interval duration (s) (shift) (ro) */
-	long stabil;            /* pps stability (scaled ppm) (ro) */
-	long jitcnt;            /* jitter limit exceeded (ro) */
-	long calcnt;            /* calibration intervals (ro) */
-	long errcnt;            /* calibration errors (ro) */
-	long stbcnt;            /* stability limit exceeded (ro) */
-
-	int  :32; int  :32; int  :32; int  :32;
-	int  :32; int  :32; int  :32; int  :32;
-	int  :32; int  :32; int  :32; int  :32;
-};
-
-/*
- * Mode codes (timex.mode)
- */
-#define ADJ_OFFSET		0x0001	/* time offset */
-#define ADJ_FREQUENCY		0x0002	/* frequency offset */
-#define ADJ_MAXERROR		0x0004	/* maximum time error */
-#define ADJ_ESTERROR		0x0008	/* estimated time error */
-#define ADJ_STATUS		0x0010	/* clock status */
-#define ADJ_TIMECONST		0x0020	/* pll time constant */
-#define ADJ_TICK		0x4000	/* tick value */
-#define ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
-
-/* xntp 3.4 compatibility names */
-#define MOD_OFFSET	ADJ_OFFSET
-#define MOD_FREQUENCY	ADJ_FREQUENCY
-#define MOD_MAXERROR	ADJ_MAXERROR
-#define MOD_ESTERROR	ADJ_ESTERROR
-#define MOD_STATUS	ADJ_STATUS
-#define MOD_TIMECONST	ADJ_TIMECONST
-#define MOD_CLKB	ADJ_TICK
-#define MOD_CLKA	ADJ_OFFSET_SINGLESHOT /* 0x8000 in original */
-
-
-/*
- * Status codes (timex.status)
- */
-#define STA_PLL		0x0001	/* enable PLL updates (rw) */
-#define STA_PPSFREQ	0x0002	/* enable PPS freq discipline (rw) */
-#define STA_PPSTIME	0x0004	/* enable PPS time discipline (rw) */
-#define STA_FLL		0x0008	/* select frequency-lock mode (rw) */
-
-#define STA_INS		0x0010	/* insert leap (rw) */
-#define STA_DEL		0x0020	/* delete leap (rw) */
-#define STA_UNSYNC	0x0040	/* clock unsynchronized (rw) */
-#define STA_FREQHOLD	0x0080	/* hold frequency (rw) */
-
-#define STA_PPSSIGNAL	0x0100	/* PPS signal present (ro) */
-#define STA_PPSJITTER	0x0200	/* PPS signal jitter exceeded (ro) */
-#define STA_PPSWANDER	0x0400	/* PPS signal wander exceeded (ro) */
-#define STA_PPSERROR	0x0800	/* PPS signal calibration error (ro) */
-
-#define STA_CLOCKERR	0x1000	/* clock hardware fault (ro) */
-
-#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
-    STA_PPSERROR | STA_CLOCKERR) /* read-only bits */
-
-/*
- * Clock states (time_state)
- */
-#define TIME_OK		0	/* clock synchronized, no leap second */
-#define TIME_INS	1	/* insert leap second */
-#define TIME_DEL	2	/* delete leap second */
-#define TIME_OOP	3	/* leap second in progress */
-#define TIME_WAIT	4	/* leap second has occurred */
-#define TIME_ERROR	5	/* clock not synchronized */
-#define TIME_BAD	TIME_ERROR /* bw compat */
-
-#ifdef __KERNEL__
-/*
- * kernel variables
- * Note: maximum error = NTP synch distance = dispersion + delay / 2;
- * estimated error = NTP dispersion.
- */
-extern long tick;                      /* timer interrupt period */
-extern int tickadj;			/* amount of adjustment per tick */
-
-/*
- * phase-lock loop variables
- */
-extern int time_state;		/* clock status */
-extern int time_status;		/* clock synchronization status bits */
-extern long time_offset;	/* time adjustment (us) */
-extern long time_constant;	/* pll time constant */
-extern long time_tolerance;	/* frequency tolerance (ppm) */
-extern long time_precision;	/* clock precision (us) */
-extern long time_maxerror;	/* maximum error */
-extern long time_esterror;	/* estimated error */
-
-extern long time_phase;		/* phase offset (scaled us) */
-extern long time_freq;		/* frequency offset (scaled ppm) */
-extern long time_adj;		/* tick adjust (scaled 1 / HZ) */
-extern long time_reftime;	/* time at last adjustment (s) */
-
-extern long time_adjust;	/* The amount of adjtime left */
-
-/* interface variables pps->timer interrupt */
-extern long pps_offset;		/* pps time offset (us) */
-extern long pps_jitter;		/* time dispersion (jitter) (us) */
-extern long pps_freq;		/* frequency offset (scaled ppm) */
-extern long pps_stabil;		/* frequency dispersion (scaled ppm) */
-extern long pps_valid;		/* pps signal watchdog counter */
-
-/* interface variables pps->adjtimex */
-extern int pps_shift;		/* interval duration (s) (shift) */
-extern long pps_jitcnt;		/* jitter limit exceeded */
-extern long pps_calcnt;		/* calibration intervals */
-extern long pps_errcnt;		/* calibration errors */
-extern long pps_stbcnt;		/* stability limit exceeded */
-
-#endif /* KERNEL */
-
-#endif /* LINUX_TIMEX_H */
-