[src/trunk]: src/sys/kern revert previous. oops.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b18f23404502
branches:  trunk
changeset: 472104:b18f23404502
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Apr 21 02:37:07 1999 +0000

description:
revert previous.  oops.

diffstat:

 sys/kern/kern_subr.c     |   7 +------
 sys/kern/kern_synch.c    |   4 +---
 sys/kern/subr_autoconf.c |   5 ++---
 sys/kern/uipc_usrreq.c   |  20 +-------------------
 sys/kern/vfs_subr.c      |   6 +-----
 5 files changed, 6 insertions(+), 36 deletions(-)

diffs (125 lines):

diff -r 0997154cf3d8 -r b18f23404502 sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Wed Apr 21 02:31:49 1999 +0000
+++ b/sys/kern/kern_subr.c      Wed Apr 21 02:37:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.46 1999/04/21 02:31:49 mrg Exp $       */
+/*     $NetBSD: kern_subr.c,v 1.47 1999/04/21 02:37:07 mrg Exp $       */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -757,13 +757,8 @@
        } else if (rootdv->dv_class == DV_IFNET)
                goto nodumpdev;
        else {
-#if 0 /* DUMPCTL */
-               dumpdv = dumpdev = NULL;
-               goto nodumpdev;
-#else
                dumpdv = rootdv;
                dumpdev = MAKEDISKDEV(major(rootdev), dumpdv->dv_unit, 1);
-#endif
        }
 
  out:
diff -r 0997154cf3d8 -r b18f23404502 sys/kern/kern_synch.c
--- a/sys/kern/kern_synch.c     Wed Apr 21 02:31:49 1999 +0000
+++ b/sys/kern/kern_synch.c     Wed Apr 21 02:37:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_synch.c,v 1.58 1999/04/21 02:31:50 mrg Exp $      */
+/*     $NetBSD: kern_synch.c,v 1.59 1999/04/21 02:37:07 mrg Exp $      */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1991, 1993
@@ -620,12 +620,10 @@
                                rlim->rlim_cur += 5;
                }
        }
-#if 0
        if (autonicetime && s > autonicetime && p->p_ucred->cr_uid && p->p_nice == NZERO) {
                p->p_nice = autoniceval + NZERO;
                resetpriority(p);
        }
-#endif
 
        /*
         * Pick a new current process and record its start time.
diff -r 0997154cf3d8 -r b18f23404502 sys/kern/subr_autoconf.c
--- a/sys/kern/subr_autoconf.c  Wed Apr 21 02:31:49 1999 +0000
+++ b/sys/kern/subr_autoconf.c  Wed Apr 21 02:37:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_autoconf.c,v 1.38 1999/04/21 02:31:50 mrg Exp $   */
+/*     $NetBSD: subr_autoconf.c,v 1.39 1999/04/21 02:37:07 mrg Exp $   */
 
 /*
  * Copyright (c) 1992, 1993
@@ -359,8 +359,7 @@
                        if (cf->cf_fstate == FSTATE_STAR)
                                cf->cf_unit++;
                }
-#if defined(__alpha__) || defined(hp300) || defined(__i386__) || \
-    (defined(__sparc__)  && !defined(SUN4U))
+#if defined(__alpha__) || defined(hp300) || defined(__i386__) || defined(__sparc__)
        device_register(dev, aux);
 #endif
        (*ca->ca_attach)(parent, dev, aux);
diff -r 0997154cf3d8 -r b18f23404502 sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c    Wed Apr 21 02:31:49 1999 +0000
+++ b/sys/kern/uipc_usrreq.c    Wed Apr 21 02:37:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_usrreq.c,v 1.40 1999/04/21 02:31:50 mrg Exp $     */
+/*     $NetBSD: uipc_usrreq.c,v 1.41 1999/04/21 02:37:07 mrg Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -916,8 +916,6 @@
 morespace:
        neededspace = (ALIGN(sizeof(*cm)) + nfds * sizeof(struct file *)) -
                control->m_len;
-       if (neededspace)
-               printf("unp_internalize: neededspace=%d\n", neededspace);
        if (neededspace > M_TRAILINGSPACE(control)) {
 
                /* if we already have a cluster, the message is just too big */
@@ -939,22 +937,6 @@
        cm->cmsg_len += neededspace;
        control->m_len = cm->cmsg_len;
 
-       if (neededspace) {
-               fdp = (int *)(cm + 1);
-               for (i = 0; i < nfds; i++) {
-                       fd = *fdp++;
-                       if ((unsigned)fd >= fdescp->fd_nfiles ||
-                           fdescp->fd_ofiles[fd] == NULL) {
-                               printf("unp_internalize: ERROR DETECTED (1)\n");
-                               return (EBADF);
-                       }
-               }
-               if ((cm->cmsg_len / sizeof(struct file *)) != nfds) {
-                       printf("unp_internalize: ERROR DETECTED (2)\n");
-                       return (EBADF);
-               }
-       }
-
        /*
         * Transform the file descriptors into struct file pointers, in
         * reverse order so that if pointers are bigger than ints, the
diff -r 0997154cf3d8 -r b18f23404502 sys/kern/vfs_subr.c
--- a/sys/kern/vfs_subr.c       Wed Apr 21 02:31:49 1999 +0000
+++ b/sys/kern/vfs_subr.c       Wed Apr 21 02:37:07 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_subr.c,v 1.101 1999/04/21 02:31:50 mrg Exp $       */
+/*     $NetBSD: vfs_subr.c,v 1.102 1999/04/21 02:37:07 mrg Exp $       */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -1472,10 +1472,6 @@
 extern const int nmountcompatnames;
 
 /*
- * XXX
- * This belongs in sys/compat/common/vfs_44.c
- */
-/*
  * Top level filesystem related information gathering.
  */
 int