From owner-svn-src-user@FreeBSD.ORG Sun Nov 30 21:04:54 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CBDB6106564A;
Sun, 30 Nov 2008 21:04:54 +0000 (UTC)
(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id BB5D18FC12;
Sun, 30 Nov 2008 21:04:54 +0000 (UTC)
(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUL4r3C001876;
Sun, 30 Nov 2008 21:04:53 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAUL4rs6001875;
Sun, 30 Nov 2008 21:04:53 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <200811302104.mAUL4rs6001875@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 30 Nov 2008 21:04:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r185487 - user/peter/kinfo/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Nov 2008 21:04:54 -0000
Author: peter
Date: Sun Nov 30 21:04:53 2008
New Revision: 185487
URL: http://svn.freebsd.org/changeset/base/185487
Log:
Properly wrap this giant block of duplicate code inside COMPAT_FREEBSD7
Modified:
user/peter/kinfo/sys/kern/kern_descrip.c
Modified: user/peter/kinfo/sys/kern/kern_descrip.c
==============================================================================
--- user/peter/kinfo/sys/kern/kern_descrip.c Sun Nov 30 21:00:22 2008 (r185486)
+++ user/peter/kinfo/sys/kern/kern_descrip.c Sun Nov 30 21:04:53 2008 (r185487)
@@ -2509,7 +2509,6 @@ sysctl_kern_file(SYSCTL_HANDLER_ARGS)
SYSCTL_PROC(_kern, KERN_FILE, file, CTLTYPE_OPAQUE|CTLFLAG_RD,
0, 0, sysctl_kern_file, "S,xfile", "Entire file table");
-
/*
* Sadly, the libgtop port has already been compiled for 7.1, but the code
* does not do enough error checking and bad things might happen. Even
@@ -2524,6 +2523,7 @@ SYSCTL_PROC(_kern, KERN_FILE, file, CTLT
CTASSERT(sizeof(struct kinfo_ofile) == KINFO_OFILE_SIZE);
#endif
+#ifdef COMPAT_FREEBSD7
static int
export_vnode_for_osysctl(struct vnode *vp, int type,
struct kinfo_ofile *kif, struct filedesc *fdp, struct sysctl_req *req)
@@ -2766,7 +2766,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLE
static SYSCTL_NODE(_kern_proc, KERN_PROC_OFILEDESC, ofiledesc, CTLFLAG_RD,
sysctl_kern_proc_ofiledesc, "Process ofiledesc entries");
-
+#endif /* COMPAT_FREEBSD7 */
#ifdef KINFO_FILE_SIZE
CTASSERT(sizeof(struct kinfo_file) == KINFO_FILE_SIZE);