From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:18:34 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id ECB7D106566B
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:18:31 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:18:31 +0000
Date: Sun, 05 Jun 2011 16:18:31 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605161831.ECB7D106566B@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222832 - soc2011/gk/ino64-head/lib/libc/gen
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:18:34 -0000

Author: gk
Date: Sun Jun  5 16:18:31 2011
New Revision: 222832
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222832

Log:
  mv dirent_private.h dirent-private.h

Added:
  soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h   (contents, props changed)
     - copied, changed from r222617, soc2011/gk/ino64-head/lib/libc/gen/dirent_private.h
Deleted:
  soc2011/gk/ino64-head/lib/libc/gen/dirent_private.h
Modified:
  soc2011/gk/ino64-head/lib/libc/gen/closedir.c
  soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c
  soc2011/gk/ino64-head/lib/libc/gen/fts.c
  soc2011/gk/ino64-head/lib/libc/gen/getcwd.c
  soc2011/gk/ino64-head/lib/libc/gen/opendir.c
  soc2011/gk/ino64-head/lib/libc/gen/readdir.c
  soc2011/gk/ino64-head/lib/libc/gen/rewinddir.c
  soc2011/gk/ino64-head/lib/libc/gen/seekdir.c
  soc2011/gk/ino64-head/lib/libc/gen/telldir.c

Modified: soc2011/gk/ino64-head/lib/libc/gen/closedir.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/closedir.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/closedir.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -42,7 +42,7 @@
 #include "un-namespace.h"
 
 #include "libc_private.h"
-#include "dirent_private.h"
+#include "dirent-private.h"
 #include "telldir.h"
 
 /*

Copied and modified: soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h (from r222617, soc2011/gk/ino64-head/lib/libc/gen/dirent_private.h)
==============================================================================

Modified: soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -52,7 +52,7 @@
 #include "fts-compat.h"
 #include "un-namespace.h"
 
-#include "dirent_private.h"
+#include "dirent-private.h"
 
 FTSENT	*__fts_children_44bsd(FTS *, int);
 int	 __fts_close_44bsd(FTS *);

Modified: soc2011/gk/ino64-head/lib/libc/gen/fts.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/fts.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/fts.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -52,7 +52,7 @@
 #include <unistd.h>
 #include "un-namespace.h"
 
-#include "dirent_private.h"
+#include "dirent-private.h"
 
 static FTSENT	*fts_alloc(FTS *, char *, size_t);
 static FTSENT	*fts_build(FTS *, int);

Modified: soc2011/gk/ino64-head/lib/libc/gen/getcwd.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/getcwd.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/getcwd.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -46,7 +46,7 @@
 #include <unistd.h>
 #include "un-namespace.h"
 
-#include "dirent_private.h"
+#include "dirent-private.h"
 
 #define	ISDOT(dp) \
 	(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \

Modified: soc2011/gk/ino64-head/lib/libc/gen/opendir.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/opendir.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/opendir.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -46,7 +46,7 @@
 #include <unistd.h>
 #include "un-namespace.h"
 
-#include "dirent_private.h"
+#include "dirent-private.h"
 #include "telldir.h"
 
 static DIR * __opendir_common(int, const char *, int);

Modified: soc2011/gk/ino64-head/lib/libc/gen/readdir.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/readdir.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/readdir.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -42,7 +42,7 @@
 #include "un-namespace.h"
 
 #include "libc_private.h"
-#include "dirent_private.h"
+#include "dirent-private.h"
 #include "telldir.h"
 
 /*

Modified: soc2011/gk/ino64-head/lib/libc/gen/rewinddir.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/rewinddir.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/rewinddir.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include "dirent_private.h"
+#include "dirent-private.h"
 #include "telldir.h"
 
 void

Modified: soc2011/gk/ino64-head/lib/libc/gen/seekdir.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/seekdir.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/seekdir.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -40,7 +40,7 @@
 #include "un-namespace.h"
 
 #include "libc_private.h"
-#include "dirent_private.h"
+#include "dirent-private.h"
 #include "telldir.h"
 
 /*

Modified: soc2011/gk/ino64-head/lib/libc/gen/telldir.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/telldir.c	Sun Jun  5 14:46:42 2011	(r222831)
+++ soc2011/gk/ino64-head/lib/libc/gen/telldir.c	Sun Jun  5 16:18:31 2011	(r222832)
@@ -43,7 +43,7 @@
 #include "un-namespace.h"
 
 #include "libc_private.h"
-#include "dirent_private.h"
+#include "dirent-private.h"
 #include "telldir.h"
 
 /*

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:18:49 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 2A44E106566B
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:18:47 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:18:47 +0000
Date: Sun, 05 Jun 2011 16:18:47 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605161847.2A44E106566B@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222833 -
	soc2011/gk/ino64-head/tools/tools/shlib-compat
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:18:49 -0000

Author: gk
Date: Sun Jun  5 16:18:46 2011
New Revision: 222833
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222833

Log:
  Add script to generate fake syscall definitions with drawrf debug info

Added:
  soc2011/gk/ino64-head/tools/tools/shlib-compat/Makefile.sysfake   (contents, props changed)
  soc2011/gk/ino64-head/tools/tools/shlib-compat/makesyscalls-fake.sh   (contents, props changed)

Added: soc2011/gk/ino64-head/tools/tools/shlib-compat/Makefile.sysfake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/gk/ino64-head/tools/tools/shlib-compat/Makefile.sysfake	Sun Jun  5 16:18:46 2011	(r222833)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+SRCS+= syscalls-fake.c
+CLEANFILES+= syscalls-fake.c
+
+syscalls-fake.c: ${.CURDIR}/../../sys/kern/syscalls.master
+	sh ${.CURDIR}/../../tools/tools/shlib-compat/makesyscalls-fake.sh \
+		${.CURDIR}/../../sys/kern/syscalls.master > ${.TARGET}
+

Added: soc2011/gk/ino64-head/tools/tools/shlib-compat/makesyscalls-fake.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/gk/ino64-head/tools/tools/shlib-compat/makesyscalls-fake.sh	Sun Jun  5 16:18:46 2011	(r222833)
@@ -0,0 +1,124 @@
+#! /bin/sh -
+# $FreeBSD$
+
+set -e
+
+case $# in
+    0)	echo "usage: $0 input-file <config-file>" 1>&2
+	exit 1
+	;;
+esac
+
+if [ -n "$2" -a -f "$2" ]; then
+	. $2
+fi
+
+sed -e '
+s/\$//g
+:join
+	/\\$/{a\
+
+	N
+	s/\\\n//
+	b join
+	}
+2,${
+	/^#/!s/\([{}()*,]\)/ \1 /g
+}
+' < $1 | awk '
+	BEGIN {
+		printf "#include <sys/param.h>\n"
+		printf "#include <machine/atomic.h>\n"
+		printf "\n"
+		printf "#include <sys/_semaphore.h>\n"
+		printf "#include <sys/aio.h>\n"
+		printf "#include <sys/cpuset.h>\n"
+		printf "#include <sys/jail.h>\n"
+		printf "#include <sys/linker.h>\n"
+		printf "#include <sys/mac.h>\n"
+		printf "#include <sys/module.h>\n"
+		printf "#include <sys/mount.h>\n"
+		printf "#include <sys/mqueue.h>\n"
+		printf "#include <sys/msg.h>\n"
+		printf "#include <sys/poll.h>\n"
+		printf "#include <sys/proc.h>\n"
+		printf "#include <sys/resource.h>\n"
+		printf "#include <sys/sem.h>\n"
+		printf "#include <sys/shm.h>\n"
+		printf "#include <sys/signal.h>\n"
+		printf "#include <sys/signalvar.h>\n"
+		printf "#include <sys/socket.h>\n"
+		printf "#include <sys/stat.h>\n"
+		printf "#include <sys/thr.h>\n"
+		printf "#include <sys/time.h>\n"
+		printf "#include <sys/timex.h>\n"
+		printf "#include <sys/ucontext.h>\n"
+		printf "#include <sys/utsname.h>\n"
+		printf "#include <sys/uuid.h>\n"
+		printf "#include <sys/wait.h>\n"
+		printf "\n"
+		printf "#ifndef _ACL_PRIVATE\n"
+		printf "#define _ACL_PRIVATE\n"
+		printf "#endif\n"
+		printf "#include <sys/acl.h>\n"
+		printf "\n"
+		printf "#ifndef EBUSY\n"
+		printf "#define errno 0\n"
+		printf "#define EBUSY 0\n"
+		printf "#endif\n"
+		printf "#include <sys/umtx.h>\n"
+		printf "\n"
+		printf "struct ostatfs;\n"
+		printf "struct osigaction;\n"
+		printf "struct osigcontext;\n"
+		printf "struct ucontext4;\n"
+		printf "struct oaiocb;\n"
+		printf "struct msqid_ds_old;\n"
+		printf "struct shmid_ds_old;\n"
+		printf "struct sctp_sndrcvinfo;\n"
+		printf "union semun_old;\n"
+		printf "typedef unsigned int osigset_t;\n"
+		printf "\n"
+	}
+	NF < 4 || $1 !~ /^[0-9]+$/ {
+		next
+	}
+	$3 ~ "UNIMPL" || $3 ~ "OBSOL" || $3 ~ "NODEF" || $3 ~ "NOPROTO" ||
+	$3 ~ "NOSTD"{
+		next
+	}
+	$4 == "{" {
+		if ($3 ~ /COMPAT[0-9]*/) {
+			n = split($3, flags, /\|/)
+			for (i = 1; i <= n; i++) {
+				if (flags[i] == "COMPAT") {
+					$6 = "o" $6
+				} else if (flags[i] ~ /COMPAT[0-9]+/) {
+					sub(/COMPAT/, "freebsd", flags[i])
+					$6 = flags[i] "_" $6
+				}
+			}
+		}
+		$6 = "__sysfake_" $6
+		r = ""
+		if ($5 != "void")
+			r = "0"
+		def = ""
+		impl = ""
+		for ( i = 5; i <= NF; i++) {
+			if ($i == ";")
+				break;
+			if ($i == "," || $i == ")")
+				impl = impl " __unused"
+			impl = impl " " $i
+			def = def " " $i
+		}
+		printf "%s;\n", def
+		printf "%s\n{ return %s; }\n", impl, r
+		next
+	}
+	{
+		printf "invalid line: "
+		print
+	}
+'

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:18:59 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 73FA71065680
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:18:57 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:18:57 +0000
Date: Sun, 05 Jun 2011 16:18:57 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605161857.73FA71065680@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222834 - soc2011/gk/ino64-head/lib/libc
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:18:59 -0000

Author: gk
Date: Sun Jun  5 16:18:57 2011
New Revision: 222834
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222834

Log:
  Support including extra Makefiles during libc build
  
  Include ${LIBC_EXTRAMK}

Modified:
  soc2011/gk/ino64-head/lib/libc/Makefile

Modified: soc2011/gk/ino64-head/lib/libc/Makefile
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/Makefile	Sun Jun  5 16:18:46 2011	(r222833)
+++ soc2011/gk/ino64-head/lib/libc/Makefile	Sun Jun  5 16:18:57 2011	(r222834)
@@ -140,6 +140,11 @@
 	cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
 .endif
 
+.if defined(LIBC_EXTRAMK) && !empty(LIBC_EXTRAMK)
+.include "${LIBC_EXTRAMK}"
+#.error ${SRCS}
+.endif
+
 .include <bsd.lib.mk>
 
 # Disable warnings in contributed sources.

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:19:10 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 52FDB106564A
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:19:08 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:19:08 +0000
Date: Sun, 05 Jun 2011 16:19:08 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605161908.52FDB106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222835 - in soc2011/gk/ino64-head/usr.sbin:
	cpucontrol newsyslog
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:19:10 -0000

Author: gk
Date: Sun Jun  5 16:19:08 2011
New Revision: 222835
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222835

Log:
  Avoid using dirfd name there is dirfd() macro already

Modified:
  soc2011/gk/ino64-head/usr.sbin/cpucontrol/cpucontrol.c
  soc2011/gk/ino64-head/usr.sbin/newsyslog/newsyslog.c

Modified: soc2011/gk/ino64-head/usr.sbin/cpucontrol/cpucontrol.c
==============================================================================
--- soc2011/gk/ino64-head/usr.sbin/cpucontrol/cpucontrol.c	Sun Jun  5 16:18:57 2011	(r222834)
+++ soc2011/gk/ino64-head/usr.sbin/cpucontrol/cpucontrol.c	Sun Jun  5 16:19:08 2011	(r222835)
@@ -290,7 +290,7 @@
 	int error;
 	struct ucode_handler *handler;
 	struct datadir *dir;
-	DIR *dirfd;
+	DIR *dirp;
 	struct dirent *direntry;
 	char buf[MAXPATHLEN];
 
@@ -319,12 +319,12 @@
 	 * Process every image in specified data directories.
 	 */
 	SLIST_FOREACH(dir, &datadirs, next) {
-		dirfd  = opendir(dir->path);
-		if (dirfd == NULL) {
+		dirp  = opendir(dir->path);
+		if (dirp == NULL) {
 			WARNX(1, "skipping directory %s: not accessible", dir->path);
 			continue;
 		}
-		while ((direntry = readdir(dirfd)) != NULL) {
+		while ((direntry = readdir(dirp)) != NULL) {
 			if (direntry->d_namlen == 0)
 				continue;
 			error = snprintf(buf, sizeof(buf), "%s/%s", dir->path,
@@ -338,7 +338,7 @@
 			}
 			handler->update(dev, buf);
 		}
-		error = closedir(dirfd);
+		error = closedir(dirp);
 		if (error != 0)
 			WARN(0, "closedir(%s)", dir->path);
 	}

Modified: soc2011/gk/ino64-head/usr.sbin/newsyslog/newsyslog.c
==============================================================================
--- soc2011/gk/ino64-head/usr.sbin/newsyslog/newsyslog.c	Sun Jun  5 16:18:57 2011	(r222834)
+++ soc2011/gk/ino64-head/usr.sbin/newsyslog/newsyslog.c	Sun Jun  5 16:19:08 2011	(r222835)
@@ -1448,7 +1448,7 @@
 delete_oldest_timelog(const struct conf_entry *ent, const char *archive_dir)
 {
 	char *logfname, *s, *dir, errbuf[80];
-	int dirfd, i, logcnt, max_logcnt, valid;
+	int dir_fd, i, logcnt, max_logcnt, valid;
 	struct oldlog_entry *oldlogs;
 	size_t logfname_len;
 	struct dirent *dp;
@@ -1483,7 +1483,7 @@
 	/* First we create a 'list' of all archived logfiles */
 	if ((dirp = opendir(dir)) == NULL)
 		err(1, "Cannot open log directory '%s'", dir);
-	dirfd = dirfd(dirp);
+	dir_fd = dirfd(dirp);
 	while ((dp = readdir(dirp)) != NULL) {
 		if (dp->d_type != DT_REG)
 			continue;
@@ -1575,7 +1575,7 @@
 			if (noaction)
 				printf("\trm -f %s/%s\n", dir,
 				    oldlogs[i].fname);
-			else if (unlinkat(dirfd, oldlogs[i].fname, 0) != 0) {
+			else if (unlinkat(dir_fd, oldlogs[i].fname, 0) != 0) {
 				snprintf(errbuf, sizeof(errbuf),
 				    "Could not delet old logfile '%s'",
 				    oldlogs[i].fname);

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:19:20 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 9FB191065673
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:19:18 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:19:18 +0000
Date: Sun, 05 Jun 2011 16:19:18 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605161918.9FB191065673@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222836 -
	soc2011/gk/ino64-head/usr.sbin/lpr/common_source
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:19:20 -0000

Author: gk
Date: Sun Jun  5 16:19:18 2011
New Revision: 222836
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222836

Log:
  Use dirfd() instead of dirp->dd_fd

Modified:
  soc2011/gk/ino64-head/usr.sbin/lpr/common_source/common.c

Modified: soc2011/gk/ino64-head/usr.sbin/lpr/common_source/common.c
==============================================================================
--- soc2011/gk/ino64-head/usr.sbin/lpr/common_source/common.c	Sun Jun  5 16:19:08 2011	(r222835)
+++ soc2011/gk/ino64-head/usr.sbin/lpr/common_source/common.c	Sun Jun  5 16:19:18 2011	(r222836)
@@ -130,7 +130,7 @@
 		seteuid(uid);
 		return (-1);
 	}
-	if (fstat(dirp->dd_fd, &stbuf) < 0)
+	if (fstat(dirfd(dirp), &stbuf) < 0)
 		goto errdone;
 	seteuid(uid);
 

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:19:37 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 009AC1065670
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:19:35 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:19:34 +0000
Date: Sun, 05 Jun 2011 16:19:34 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605161935.009AC1065670@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222837 - in soc2011/gk/ino64-head: include
	lib/libc/gen
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:19:37 -0000

Author: gk
Date: Sun Jun  5 16:19:34 2011
New Revision: 222837
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222837

Log:
  Replace dirfd() macro with exported libc symbol
  
  Use _dirfd() macro internally

Added:
  soc2011/gk/ino64-head/lib/libc/gen/dirfd.c
     - copied, changed from r222836, soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h
Modified:
  soc2011/gk/ino64-head/include/dirent.h
  soc2011/gk/ino64-head/lib/libc/gen/Makefile.inc
  soc2011/gk/ino64-head/lib/libc/gen/Symbol.map
  soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h
  soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c
  soc2011/gk/ino64-head/lib/libc/gen/fts.c
  soc2011/gk/ino64-head/lib/libc/gen/getcwd.c

Modified: soc2011/gk/ino64-head/include/dirent.h
==============================================================================
--- soc2011/gk/ino64-head/include/dirent.h	Sun Jun  5 16:19:18 2011	(r222836)
+++ soc2011/gk/ino64-head/include/dirent.h	Sun Jun  5 16:19:34 2011	(r222837)
@@ -79,6 +79,7 @@
 DIR	*__opendir2(const char *, int);
 int	 getdents(int, char *, int);
 int	 getdirentries(int, char *, int, long *);
+int	 dirfd(DIR *);
 #endif
 DIR	*opendir(const char *);
 DIR	*fdopendir(int);

Modified: soc2011/gk/ino64-head/lib/libc/gen/Makefile.inc
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/Makefile.inc	Sun Jun  5 16:19:18 2011	(r222836)
+++ soc2011/gk/ino64-head/lib/libc/gen/Makefile.inc	Sun Jun  5 16:19:34 2011	(r222837)
@@ -9,7 +9,7 @@
 	_thread_init.c \
 	alarm.c arc4random.c assert.c aux.c basename.c check_utility_compat.c \
 	clock.c closedir.c confstr.c \
-	crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
+	crypt.c ctermid.c daemon.c devname.c dirfd.c dirname.c disklabel.c \
 	dlfcn.c drand48.c elf_utils.c erand48.c err.c errlst.c errno.c \
 	exec.c fdevname.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \
 	fpclassify.c frexp.c fstab.c ftok.c fts.c fts-compat.c ftw.c \

Modified: soc2011/gk/ino64-head/lib/libc/gen/Symbol.map
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/Symbol.map	Sun Jun  5 16:19:18 2011	(r222836)
+++ soc2011/gk/ino64-head/lib/libc/gen/Symbol.map	Sun Jun  5 16:19:34 2011	(r222837)
@@ -359,6 +359,7 @@
 FBSD_1.2 {
 	basename_r;
 	cfmakesane;
+	dirfd;
 	endutxent;
 	getpagesizes;
 	getutxent;

Modified: soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h	Sun Jun  5 16:19:18 2011	(r222836)
+++ soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h	Sun Jun  5 16:19:34 2011	(r222837)
@@ -49,6 +49,6 @@
 	struct _telldir *dd_td;	/* telldir position recording */
 };
 
-#define	dirfd(dirp)	((dirp)->dd_fd)
+#define	_dirfd(dirp)	((dirp)->dd_fd)
 
 #endif /* !_DIRENT_PRIVATE_H_ */

Copied and modified: soc2011/gk/ino64-head/lib/libc/gen/dirfd.c (from r222836, soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h)
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/dirent-private.h	Sun Jun  5 16:19:18 2011	(r222836, copy source)
+++ soc2011/gk/ino64-head/lib/libc/gen/dirfd.c	Sun Jun  5 16:19:34 2011	(r222837)
@@ -29,26 +29,22 @@
  * $FreeBSD$
  */
 
-#ifndef _DIRENT_PRIVATE_H_
-#define _DIRENT_PRIVATE_H_
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
-struct _telldir;		/* see telldir.h */
-struct pthread_mutex;
+#include "namespace.h"
+#include <sys/param.h>
 
-/* structure describing an open directory. */
-struct _dirdesc {
-	int	dd_fd;		/* file descriptor associated with directory */
-	long	dd_loc;		/* offset in current buffer */
-	long	dd_size;	/* amount of data returned by getdirentries */
-	char	*dd_buf;	/* data buffer */
-	int	dd_len;		/* size of data buffer */
-	long	dd_seek;	/* magic cookie returned by getdirentries */
-	long	dd_rewind;	/* magic cookie for rewinding */
-	int	dd_flags;	/* flags for readdir */
-	struct pthread_mutex	*dd_lock;	/* lock */
-	struct _telldir *dd_td;	/* telldir position recording */
-};
+#include <dirent.h>
+#include "un-namespace.h"
 
-#define	dirfd(dirp)	((dirp)->dd_fd)
+#include "dirent-private.h"
 
-#endif /* !_DIRENT_PRIVATE_H_ */
+int
+dirfd(DIR *dirp)
+{
+	if (dirp == NULL)
+		return (-1);
+
+	return (_dirfd(dirp));
+}

Modified: soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c	Sun Jun  5 16:19:18 2011	(r222836)
+++ soc2011/gk/ino64-head/lib/libc/gen/fts-compat.c	Sun Jun  5 16:19:34 2011	(r222837)
@@ -713,7 +713,7 @@
 	 */
 	cderrno = 0;
 	if (nlinks || type == BREAD) {
-		if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
+		if (fts_safe_changedir(sp, cur, _dirfd(dirp), NULL)) {
 			if (nlinks && type == BREAD)
 				cur->fts_errno = errno;
 			cur->fts_flags |= FTS_DONTCHDIR;

Modified: soc2011/gk/ino64-head/lib/libc/gen/fts.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/fts.c	Sun Jun  5 16:19:18 2011	(r222836)
+++ soc2011/gk/ino64-head/lib/libc/gen/fts.c	Sun Jun  5 16:19:34 2011	(r222837)
@@ -710,7 +710,7 @@
 	 */
 	cderrno = 0;
 	if (nlinks || type == BREAD) {
-		if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
+		if (fts_safe_changedir(sp, cur, _dirfd(dirp), NULL)) {
 			if (nlinks && type == BREAD)
 				cur->fts_errno = errno;
 			cur->fts_flags |= FTS_DONTCHDIR;

Modified: soc2011/gk/ino64-head/lib/libc/gen/getcwd.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/gen/getcwd.c	Sun Jun  5 16:19:18 2011	(r222836)
+++ soc2011/gk/ino64-head/lib/libc/gen/getcwd.c	Sun Jun  5 16:19:34 2011	(r222837)
@@ -119,7 +119,7 @@
 
 	for (first = 1;; first = 0) {
 		/* Stat the current level. */
-		if (dir != NULL ? _fstat(dirfd(dir), &s) : lstat(".", &s))
+		if (dir != NULL ? _fstat(_dirfd(dir), &s) : lstat(".", &s))
 			goto err;
 
 		/* Save current node values. */
@@ -141,13 +141,13 @@
 		}
 
 		/* Open and stat parent directory. */
-		fd = _openat(dir != NULL ? dirfd(dir) : AT_FDCWD,
+		fd = _openat(dir != NULL ? _dirfd(dir) : AT_FDCWD,
 				"..", O_RDONLY);
 		if (fd == -1)
 			goto err;
 		if (dir)
 			(void) closedir(dir);
-		if (!(dir = fdopendir(fd)) || _fstat(dirfd(dir), &s)) {
+		if (!(dir = fdopendir(fd)) || _fstat(_dirfd(dir), &s)) {
 			_close(fd);
 			goto err;
 		}
@@ -173,7 +173,7 @@
 					continue;
 
 				/* Save the first error for later. */
-				if (fstatat(dirfd(dir), dp->d_name, &s,
+				if (fstatat(_dirfd(dir), dp->d_name, &s,
 				    AT_SYMLINK_NOFOLLOW)) {
 					if (!save_errno)
 						save_errno = errno;

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:19:49 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id E05C5106564A
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:19:46 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:19:46 +0000
Date: Sun, 05 Jun 2011 16:19:46 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605161946.E05C5106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222838 - in soc2011/gk/ino64-head/sys: fs/unionfs
	kern
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:19:49 -0000

Author: gk
Date: Sun Jun  5 16:19:46 2011
New Revision: 222838
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222838

Log:
  Skip empty directory entries (entries with zero inode number) during name lookup

Modified:
  soc2011/gk/ino64-head/sys/fs/unionfs/union_subr.c
  soc2011/gk/ino64-head/sys/kern/vfs_default.c

Modified: soc2011/gk/ino64-head/sys/fs/unionfs/union_subr.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/unionfs/union_subr.c	Sun Jun  5 16:19:34 2011	(r222837)
+++ soc2011/gk/ino64-head/sys/fs/unionfs/union_subr.c	Sun Jun  5 16:19:46 2011	(r222838)
@@ -1177,7 +1177,7 @@
 		edp = (struct dirent*)&buf[sizeof(buf) - uio.uio_resid];
 		for (dp = (struct dirent*)buf; !error && dp < edp;
 		     dp = (struct dirent*)((caddr_t)dp + dp->d_reclen)) {
-			if (dp->d_type == DT_WHT ||
+			if (dp->d_type == DT_WHT || dp->d_fileno == 0 ||
 			    (dp->d_namlen == 1 && dp->d_name[0] == '.') ||
 			    (dp->d_namlen == 2 && !bcmp(dp->d_name, "..", 2)))
 				continue;

Modified: soc2011/gk/ino64-head/sys/kern/vfs_default.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/vfs_default.c	Sun Jun  5 16:19:34 2011	(r222837)
+++ soc2011/gk/ino64-head/sys/kern/vfs_default.c	Sun Jun  5 16:19:46 2011	(r222838)
@@ -339,7 +339,7 @@
 		if (error)
 			goto out;
 
-		if ((dp->d_type != DT_WHT) &&
+		if (dp->d_type != DT_WHT && dp->d_fileno != 0 &&
 		    !strcmp(dp->d_name, dirname)) {
 			found = 1;
 			goto out;

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:20:12 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id A938F1065686
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:20:10 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:20:10 +0000
Date: Sun, 05 Jun 2011 16:20:10 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162010.A938F1065686@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222839 - in soc2011/gk/ino64-head/sys/boot:
	arm/at91/boot2 arm/ixp425/boot2 common i386/boot2
	i386/gptboot pc98/boot2 powerpc/boot1.chrp sparc64/boot1
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:20:12 -0000

Author: gk
Date: Sun Jun  5 16:20:10 2011
New Revision: 222839
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222839

Log:
  boot: Use 32 bit ufs_ino_t to keep boot2 small

Modified:
  soc2011/gk/ino64-head/sys/boot/arm/at91/boot2/boot2.c
  soc2011/gk/ino64-head/sys/boot/arm/ixp425/boot2/boot2.c
  soc2011/gk/ino64-head/sys/boot/common/ufsread.c
  soc2011/gk/ino64-head/sys/boot/i386/boot2/boot2.c
  soc2011/gk/ino64-head/sys/boot/i386/gptboot/gptboot.c
  soc2011/gk/ino64-head/sys/boot/pc98/boot2/boot2.c
  soc2011/gk/ino64-head/sys/boot/powerpc/boot1.chrp/boot1.c
  soc2011/gk/ino64-head/sys/boot/sparc64/boot1/boot1.c

Modified: soc2011/gk/ino64-head/sys/boot/arm/at91/boot2/boot2.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/arm/at91/boot2/boot2.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/arm/at91/boot2/boot2.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -93,7 +93,6 @@
 
 static void load(void);
 static int parse(void);
-static int xfsread(ino_t, void *, size_t);
 static int dskread(void *, unsigned, unsigned);
 #ifdef FIXUP_BOOT_DRV
 static void fixup_boot_drv(caddr_t, int, int, int);
@@ -109,7 +108,7 @@
 #endif
 
 static inline int
-xfsread(ino_t inode, void *buf, size_t nbyte)
+xfsread(ufs_ino_t inode, void *buf, size_t nbyte)
 {
 	if ((size_t)fsread(inode, buf, nbyte) != nbyte)
 		return -1;
@@ -152,7 +151,7 @@
 main(void)
 {
 	int autoboot, c = 0;
-	ino_t ino;
+	ufs_ino_t ino;
 
 	dmadat = (void *)(0x20000000 + (16 << 20));
 	board_init();
@@ -196,7 +195,7 @@
 	Elf32_Ehdr eh;
 	static Elf32_Phdr ep[2];
 	caddr_t p;
-	ino_t ino;
+	ufs_ino_t ino;
 	uint32_t addr;
 	int i, j;
 #ifdef FIXUP_BOOT_DRV

Modified: soc2011/gk/ino64-head/sys/boot/arm/ixp425/boot2/boot2.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/arm/ixp425/boot2/boot2.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/arm/ixp425/boot2/boot2.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -97,7 +97,6 @@
 
 static void load(void);
 static int parse(void);
-static int xfsread(ino_t, void *, size_t);
 static int dskread(void *, unsigned, unsigned);
 static int drvread(void *, unsigned, unsigned);
 #ifdef FIXUP_BOOT_DRV
@@ -113,7 +112,7 @@
 #endif
 
 static inline int
-xfsread(ino_t inode, void *buf, size_t nbyte)
+xfsread(ufs_ino_t inode, void *buf, size_t nbyte)
 {
 	if ((size_t)fsread(inode, buf, nbyte) != nbyte)
 		return -1;
@@ -157,7 +156,7 @@
 {
 	const char *bt;
 	int autoboot, c = 0;
-	ino_t ino;
+	ufs_ino_t ino;
 
 	dmadat = (void *)(0x1c0000);
 	p_memset((char *)dmadat, 0, 32 * 1024);
@@ -205,7 +204,7 @@
 	Elf32_Ehdr eh;
 	static Elf32_Phdr ep[2];
 	caddr_t p;
-	ino_t ino;
+	ufs_ino_t ino;
 	uint32_t addr;
 	int i, j;
 #ifdef FIXUP_BOOT_DRV

Modified: soc2011/gk/ino64-head/sys/boot/common/ufsread.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/common/ufsread.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/common/ufsread.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -57,6 +57,8 @@
 #define cgbase(fs, c)   ((ufs2_daddr_t)((fs)->fs_fpg * (c)))
 #endif
 
+typedef	uint32_t	ufs_ino_t;
+
 /*
  * We use 4k `virtual' blocks for filesystem data, whatever the actual
  * filesystem block size. FFS blocks are always a multiple of 4k.
@@ -84,14 +86,14 @@
 };
 static struct dmadat *dmadat;
 
-static ino_t lookup(const char *);
-static ssize_t fsread(ino_t, void *, size_t);
+static ufs_ino_t lookup(const char *);
+static ssize_t fsread(ufs_ino_t, void *, size_t);
 
 static uint8_t ls, dsk_meta;
 static uint32_t fs_off;
 
 static __inline int
-fsfind(const char *name, ino_t * ino)
+fsfind(const char *name, ufs_ino_t * ino)
 {
 	char buf[DEV_BSIZE];
 	struct direct *d;
@@ -115,12 +117,12 @@
 	return 0;
 }
 
-static ino_t
+static ufs_ino_t
 lookup(const char *path)
 {
 	char name[MAXNAMLEN + 1];
 	const char *s;
-	ino_t ino;
+	ufs_ino_t ino;
 	ssize_t n;
 	uint8_t dt;
 
@@ -162,7 +164,7 @@
 #endif
 
 static ssize_t
-fsread(ino_t inode, void *buf, size_t nbyte)
+fsread(ufs_ino_t inode, void *buf, size_t nbyte)
 {
 #ifndef UFS2_ONLY
 	static struct ufs1_dinode dp1;
@@ -170,7 +172,7 @@
 #ifndef UFS1_ONLY
 	static struct ufs2_dinode dp2;
 #endif
-	static ino_t inomap;
+	static ufs_ino_t inomap;
 	char *blkbuf;
 	void *indbuf;
 	struct fs *fs;

Modified: soc2011/gk/ino64-head/sys/boot/i386/boot2/boot2.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/i386/boot2/boot2.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/i386/boot2/boot2.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -140,7 +140,6 @@
 void exit(int);
 static void load(void);
 static int parse(void);
-static int xfsread(ino_t, void *, size_t);
 static int dskread(void *, unsigned, unsigned);
 static void printf(const char *,...);
 static void putchar(int);
@@ -172,7 +171,7 @@
 #include "ufsread.c"
 
 static inline int
-xfsread(ino_t inode, void *buf, size_t nbyte)
+xfsread(ufs_ino_t inode, void *buf, size_t nbyte)
 {
     if ((size_t)fsread(inode, buf, nbyte) != nbyte) {
 	printf("Invalid %s\n", "format");
@@ -224,7 +223,7 @@
 main(void)
 {
     uint8_t autoboot;
-    ino_t ino;
+    ufs_ino_t ino;
 
     kname = NULL;
     dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
@@ -306,7 +305,7 @@
     static Elf32_Phdr ep[2];
     static Elf32_Shdr es[2];
     caddr_t p;
-    ino_t ino;
+    ufs_ino_t ino;
     uint32_t addr;
     int i, j;
 

Modified: soc2011/gk/ino64-head/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/i386/gptboot/gptboot.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/i386/gptboot/gptboot.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -89,14 +89,13 @@
 void exit(int);
 static void load(void);
 static int parse(char *, int *);
-static int xfsread(ino_t, void *, size_t);
 static int dskread(void *, daddr_t, unsigned);
 static uint32_t memsize(void);
 
 #include "ufsread.c"
 
 static inline int
-xfsread(ino_t inode, void *buf, size_t nbyte)
+xfsread(ufs_ino_t inode, void *buf, size_t nbyte)
 {
 
 	if ((size_t)fsread(inode, buf, nbyte) != nbyte) {
@@ -137,7 +136,7 @@
 {
 	char cmd[512], cmdtmp[512];
 	int autoboot, dskupdated;
-	ino_t ino;
+	ufs_ino_t ino;
 
 	dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
 	v86.ctl = V86_FLAGS;
@@ -246,7 +245,7 @@
     static Elf32_Phdr ep[2];
     static Elf32_Shdr es[2];
     caddr_t p;
-    ino_t ino;
+    ufs_ino_t ino;
     uint32_t addr, x;
     int fmt, i, j;
 

Modified: soc2011/gk/ino64-head/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/pc98/boot2/boot2.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/pc98/boot2/boot2.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -142,7 +142,6 @@
 void exit(int);
 static void load(void);
 static int parse(void);
-static int xfsread(ino_t, void *, size_t);
 static int dskread(void *, unsigned, unsigned);
 static void printf(const char *,...);
 static void putchar(int);
@@ -174,7 +173,7 @@
 #include "ufsread.c"
 
 static inline int
-xfsread(ino_t inode, void *buf, size_t nbyte)
+xfsread(ufs_ino_t inode, void *buf, size_t nbyte)
 {
     if ((size_t)fsread(inode, buf, nbyte) != nbyte) {
 	printf("Invalid %s\n", "format");
@@ -353,7 +352,7 @@
     int i;
 #endif
     uint8_t autoboot;
-    ino_t ino;
+    ufs_ino_t ino;
 
     dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
     v86.ctl = V86_FLAGS;
@@ -444,7 +443,7 @@
     static Elf32_Phdr ep[2];
     static Elf32_Shdr es[2];
     caddr_t p;
-    ino_t ino;
+    ufs_ino_t ino;
     uint32_t addr;
     int i, j;
 

Modified: soc2011/gk/ino64-head/sys/boot/powerpc/boot1.chrp/boot1.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/powerpc/boot1.chrp/boot1.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/powerpc/boot1.chrp/boot1.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -45,7 +45,6 @@
 static ofwh_t bootdev;
 
 static struct fs fs;
-static ino_t inomap;
 static char blkbuf[BSIZEMAX];
 static unsigned int fsblks;
 
@@ -490,7 +489,7 @@
 	Elf32_Ehdr eh;
 	Elf32_Phdr ph;
 	caddr_t p;
-	ino_t ino;
+	ufs_ino_t ino;
 	int i;
 
 	if ((ino = lookup(fname)) == 0) {

Modified: soc2011/gk/ino64-head/sys/boot/sparc64/boot1/boot1.c
==============================================================================
--- soc2011/gk/ino64-head/sys/boot/sparc64/boot1/boot1.c	Sun Jun  5 16:19:46 2011	(r222838)
+++ soc2011/gk/ino64-head/sys/boot/sparc64/boot1/boot1.c	Sun Jun  5 16:20:10 2011	(r222839)
@@ -385,7 +385,7 @@
 	Elf64_Ehdr eh;
 	Elf64_Phdr ph;
 	caddr_t p;
-	ino_t ino;
+	ufs_ino_t ino;
 	int i;
 
 	if ((ino = lookup(fname)) == 0) {

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:20:40 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 71B32106566C
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:20:38 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:20:38 +0000
Date: Sun, 05 Jun 2011 16:20:38 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162038.71B32106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222840 - in soc2011/gk/ino64-head/sys: compat/svr4
	fs/cd9660 fs/ext2fs fs/hpfs fs/ntfs fs/tmpfs kern
	security/mac_lomac ufs/ffs ufs/ufs
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:20:40 -0000

Author: gk
Date: Sun Jun  5 16:20:38 2011
New Revision: 222840
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222840

Log:
  sys: Change ino_t printf format flag to %ju

Modified:
  soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c
  soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c
  soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c
  soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c
  soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c
  soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c
  soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c
  soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c
  soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c
  soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c
  soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c
  soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c
  soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c
  soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c
  soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c
  soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c
  soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c

Modified: soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/compat/svr4/svr4_socket.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -93,7 +93,7 @@
 	struct svr4_sockcache_entry *e;
 	void *cookie = ((struct socket *)fp->f_data)->so_emuldata;
 
-	DPRINTF(("svr4_find_socket: [%p,%d,%d]: ", td, dev, ino));
+	DPRINTF(("svr4_find_socket: [%p,%d,%ju]: ", td, dev, (uintmax_t)ino));
 	mtx_lock(&svr4_sockcache_lock);
 	TAILQ_FOREACH(e, &svr4_head, entries)
 		if (e->p == td->td_proc && e->dev == dev && e->ino == ino) {
@@ -142,8 +142,8 @@
 	mtx_lock(&svr4_sockcache_lock);
 	TAILQ_INSERT_HEAD(&svr4_head, e, entries);
 	mtx_unlock(&svr4_sockcache_lock);
-	DPRINTF(("svr4_add_socket: %s [%p,%d,%d]\n", e->sock.sun_path,
-		 td->td_proc, e->dev, e->ino));
+	DPRINTF(("svr4_add_socket: %s [%p,%d,%ju]\n", e->sock.sun_path,
+		 td->td_proc, e->dev, (uintmax_t)e->ino));
 	return 0;
 }
 
@@ -160,8 +160,9 @@
 		if (e->p == p && e->cookie == cookie) {
 			TAILQ_REMOVE(&svr4_head, e, entries);
 			mtx_unlock(&svr4_sockcache_lock);
-			DPRINTF(("svr4_delete_socket: %s [%p,%d,%d]\n",
-				 e->sock.sun_path, p, (int)e->dev, e->ino));
+			DPRINTF(("svr4_delete_socket: %s [%p,%d,%ju]\n",
+				 e->sock.sun_path, p, (int)e->dev,
+				 (uintmax_t)e->ino));
 			free(e, M_TEMP);
 			return;
 		}
@@ -179,8 +180,9 @@
 	TAILQ_FOREACH_SAFE(e, &svr4_head, entries, ne) {
 		if (e->p == p) {
 			TAILQ_REMOVE(&svr4_head, e, entries);
-			DPRINTF(("svr4_purge_sockcache: %s [%p,%d,%d]\n",
-				 e->sock.sun_path, p, (int)e->dev, e->ino));
+			DPRINTF(("svr4_purge_sockcache: %s [%p,%d,%ju]\n",
+				 e->sock.sun_path, p, (int)e->dev,
+				 (uintmax_t)e->ino));
 			free(e, M_TEMP);
 		}
 	}

Modified: soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/cd9660/cd9660_vnops.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -475,6 +475,7 @@
 	struct iso_mnt *imp;
 	struct buf *bp = NULL;
 	struct iso_directory_record *ep;
+	ino_t rripino;
 	int entryoffsetinblock;
 	doff_t endsearch;
 	u_long bmask;
@@ -579,7 +580,8 @@
 		switch (imp->iso_ftype) {
 		case ISO_FTYPE_RRIP:
 			cd9660_rrip_getname(ep,idp->current.d_name, &namelen,
-					   &idp->current.d_fileno,imp);
+					   &rripino, imp);
+			idp->current.d_fileno = rripino;
 			idp->current.d_namlen = (u_char)namelen;
 			if (idp->current.d_namlen)
 				error = iso_uiodir(idp,&idp->current,idp->curroff);

Modified: soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_alloc.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -906,8 +906,8 @@
 	fs = pip->i_e2fs;
 	ump = pip->i_ump;
 	if ((u_int)ino > fs->e2fs_ipg * fs->e2fs_gcount)
-		panic("ext2_vfree: range: devvp = %p, ino = %d, fs = %s",
-		    pip->i_devvp, ino, fs->e2fs_fsmnt);
+		panic("ext2_vfree: range: devvp = %p, ino = %ju, fs = %s",
+		    pip->i_devvp, (uintmax_t)ino, fs->e2fs_fsmnt);
 
 	cg = ino_to_cg(fs, ino);
 	error = bread(pip->i_devvp,

Modified: soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/ext2fs/ext2_inode_cnv.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -42,7 +42,7 @@
 {
 	int i;
 
-	printf( "Inode: %5d", in->i_number);
+	printf( "Inode: %5ju", (uintmax_t)in->i_number);
 	printf( /* "Inode: %5d" */
 		" Type: %10s Mode: 0x%o Flags: 0x%x  Version: %d\n",
 		"n/a", in->i_mode, in->i_flags, in->i_gen);

Modified: soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vfsops.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -511,7 +511,7 @@
 
 	error = bread(hpmp->hpm_devvp, ino, FNODESIZE, NOCRED, &bp);
 	if (error) {
-		printf("hpfs_vget: can't read ino %d\n",ino);
+		printf("hpfs_vget: can't read ino %ju\n", (uintmax_t)ino);
 		vput(vp);
 		return (error);
 	}

Modified: soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_subr.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -82,8 +82,8 @@
 ntfs_ntvattrrele(vap)
 	struct ntvattr * vap;
 {
-	dprintf(("ntfs_ntvattrrele: ino: %d, type: 0x%x\n",
-		 vap->va_ip->i_number, vap->va_type));
+	dprintf(("ntfs_ntvattrrele: ino: %ju, type: 0x%x\n",
+		 (uintmax_t)vap->va_ip->i_number, vap->va_type));
 
 	ntfs_ntrele(vap->va_ip);
 
@@ -107,12 +107,12 @@
 	struct ntvattr *vap;
 
 	if((ip->i_flag & IN_LOADED) == 0) {
-		dprintf(("ntfs_findvattr: node not loaded, ino: %d\n",
-		       ip->i_number));
+		dprintf(("ntfs_findvattr: node not loaded, ino: %ju\n",
+		       (uintmax_t)ip->i_number));
 		error = ntfs_loadntnode(ntmp,ip);
 		if (error) {
-			printf("ntfs_findvattr: FAILED TO LOAD INO: %d\n",
-			       ip->i_number);
+			printf("ntfs_findvattr: FAILED TO LOAD INO: %ju\n",
+			       (uintmax_t)ip->i_number);
 			return (error);
 		}
 	}
@@ -167,13 +167,13 @@
 
 	if (name) {
 		dprintf(("ntfs_ntvattrget: " \
-			 "ino: %d, type: 0x%x, name: %s, vcn: %d\n", \
-			 ip->i_number, type, name, (u_int32_t) vcn));
+			 "ino: %ju, type: 0x%x, name: %s, vcn: %d\n", \
+			 (uintmax_t)ip->i_number, type, name, (u_int32_t) vcn));
 		namelen = strlen(name);
 	} else {
 		dprintf(("ntfs_ntvattrget: " \
-			 "ino: %d, type: 0x%x, vcn: %d\n", \
-			 ip->i_number, type, (u_int32_t) vcn));
+			 "ino: %ju, type: 0x%x, vcn: %d\n", \
+			 (uintmax_t)ip->i_number, type, (u_int32_t) vcn));
 		name = "";
 		namelen = 0;
 	}
@@ -184,8 +184,8 @@
 
 	if (!lvap) {
 		dprintf(("ntfs_ntvattrget: UNEXISTED ATTRIBUTE: " \
-		       "ino: %d, type: 0x%x, name: %s, vcn: %d\n", \
-		       ip->i_number, type, name, (u_int32_t) vcn));
+		       "ino: %ju, type: 0x%x, name: %s, vcn: %d\n", \
+		       (uintmax_t)ip->i_number, type, name, (u_int32_t) vcn));
 		return (ENOENT);
 	}
 	/* Scan $ATTRIBUTE_LIST for requested attribute */
@@ -243,8 +243,9 @@
 	error = ENOENT;
 
 	dprintf(("ntfs_ntvattrget: UNEXISTED ATTRIBUTE: " \
-	       "ino: %d, type: 0x%x, name: %.*s, vcn: %d\n", \
-	       ip->i_number, type, (int) namelen, name, (u_int32_t) vcn));
+	       "ino: %ju, type: 0x%x, name: %.*s, vcn: %d\n", \
+	       (uintmax_t)ip->i_number, type, (int) namelen, name,
+	       (u_int32_t) vcn));
 out:
 	free(alpool, M_TEMP);
 	return (error);
@@ -266,7 +267,8 @@
 	struct attr    *ap;
 	struct ntvattr *nvap;
 
-	dprintf(("ntfs_loadntnode: loading ino: %d\n",ip->i_number));
+	dprintf(("ntfs_loadntnode: loading ino: %ju\n",
+	    (uintmax_t)ip->i_number));
 
 	mfrp = malloc(ntfs_bntob(ntmp->ntm_bpmftrec),
 	       M_TEMP, M_WAITOK);
@@ -307,12 +309,13 @@
 	error = ntfs_procfixups(ntmp, NTFS_FILEMAGIC, (caddr_t)mfrp,
 				ntfs_bntob(ntmp->ntm_bpmftrec));
 	if (error) {
-		printf("ntfs_loadntnode: BAD MFT RECORD %d\n",
-		       (u_int32_t) ip->i_number);
+		printf("ntfs_loadntnode: BAD MFT RECORD %ju\n",
+		       (uintmax_t)ip->i_number);
 		goto out;
 	}
 
-	dprintf(("ntfs_loadntnode: load attrs for ino: %d\n",ip->i_number));
+	dprintf(("ntfs_loadntnode: load attrs for ino: %ju\n",
+	    (uintmax_t)ip->i_number));
 	off = mfrp->fr_attroff;
 	ap = (struct attr *) ((caddr_t)mfrp + off);
 
@@ -330,8 +333,8 @@
 		ap = (struct attr *) ((caddr_t)mfrp + off);
 	}
 	if (error) {
-		printf("ntfs_loadntnode: failed to load attr ino: %d\n",
-		       ip->i_number);
+		printf("ntfs_loadntnode: failed to load attr ino: %ju\n",
+		       (uintmax_t)ip->i_number);
 		goto out;
 	}
 
@@ -354,8 +357,8 @@
 ntfs_ntget(ip)
 	struct ntnode *ip;
 {
-	dprintf(("ntfs_ntget: get ntnode %d: %p, usecount: %d\n",
-		ip->i_number, ip, ip->i_usecount));
+	dprintf(("ntfs_ntget: get ntnode %ju: %p, usecount: %d\n",
+	    (uintmax_t)ip->i_number, ip, ip->i_usecount));
 
 	mtx_lock(&ip->i_interlock);
 	ip->i_usecount++;
@@ -379,14 +382,14 @@
 {
 	struct ntnode  *ip;
 
-	dprintf(("ntfs_ntlookup: looking for ntnode %d\n", ino));
+	dprintf(("ntfs_ntlookup: looking for ntnode %ju\n", (uintmax_t)ino));
 
 	do {
 		ip = ntfs_nthashlookup(ntmp->ntm_devvp->v_rdev, ino);
 		if (ip != NULL) {
 			ntfs_ntget(ip);
-			dprintf(("ntfs_ntlookup: ntnode %d: %p, usecount: %d\n",
-				ino, ip, ip->i_usecount));
+			dprintf(("ntfs_ntlookup: ntnode %ju: %p, usecount: %d\n",
+				(uintmax_t)ino, ip, ip->i_usecount));
 			*ipp = ip;
 			return (0);
 		}
@@ -394,7 +397,8 @@
 
 	ip = malloc(sizeof(struct ntnode), M_NTFSNTNODE,
 		M_WAITOK | M_ZERO);
-	ddprintf(("ntfs_ntlookup: allocating ntnode: %d: %p\n", ino, ip));
+	ddprintf(("ntfs_ntlookup: allocating ntnode: %ju: %p\n",
+	    (uintmax_t)ino, ip));
 
 	/* Generic initialization */
 	ip->i_devvp = ntmp->ntm_devvp;
@@ -416,8 +420,8 @@
 
 	*ipp = ip;
 
-	dprintf(("ntfs_ntlookup: ntnode %d: %p, usecount: %d\n",
-		ino, ip, ip->i_usecount));
+	dprintf(("ntfs_ntlookup: ntnode %ju: %p, usecount: %d\n",
+		(uintmax_t)ino, ip, ip->i_usecount));
 
 	return (0);
 }
@@ -434,16 +438,16 @@
 {
 	struct ntvattr *vap;
 
-	dprintf(("ntfs_ntput: rele ntnode %d: %p, usecount: %d\n",
-		ip->i_number, ip, ip->i_usecount));
+	dprintf(("ntfs_ntput: rele ntnode %ju: %p, usecount: %d\n",
+		(uintmax_t)ip->i_number, ip, ip->i_usecount));
 
 	mtx_lock(&ip->i_interlock);
 	ip->i_usecount--;
 
 #ifdef DIAGNOSTIC
 	if (ip->i_usecount < 0) {
-		panic("ntfs_ntput: ino: %d usecount: %d \n",
-		      ip->i_number,ip->i_usecount);
+		panic("ntfs_ntput: ino: %ju usecount: %d \n",
+		      (uintmax_t)ip->i_number, ip->i_usecount);
 	}
 #endif
 
@@ -452,7 +456,8 @@
 		return;
 	}
 
-	dprintf(("ntfs_ntput: deallocating ntnode: %d\n", ip->i_number));
+	dprintf(("ntfs_ntput: deallocating ntnode: %ju\n",
+	    (uintmax_t)ip->i_number));
 
 	if (LIST_FIRST(&ip->i_fnlist))
 		panic("ntfs_ntput: ntnode has fnodes\n");
@@ -481,8 +486,8 @@
 	ip->i_usecount++;
 	mtx_unlock(&ip->i_interlock);
 
-	dprintf(("ntfs_ntref: ino %d, usecount: %d\n",
-		ip->i_number, ip->i_usecount));
+	dprintf(("ntfs_ntref: ino %ju, usecount: %d\n",
+		(uintmax_t)ip->i_number, ip->i_usecount));
 			
 }
 
@@ -493,15 +498,15 @@
 ntfs_ntrele(ip)
 	struct ntnode *ip;
 {
-	dprintf(("ntfs_ntrele: rele ntnode %d: %p, usecount: %d\n",
-		ip->i_number, ip, ip->i_usecount));
+	dprintf(("ntfs_ntrele: rele ntnode %ju: %p, usecount: %d\n",
+		(uintmax_t)ip->i_number, ip, ip->i_usecount));
 
 	mtx_lock(&ip->i_interlock);
 	ip->i_usecount--;
 
 	if (ip->i_usecount < 0)
-		panic("ntfs_ntrele: ino: %d usecount: %d \n",
-		      ip->i_number,ip->i_usecount);
+		panic("ntfs_ntrele: ino: %ju usecount: %d\n",
+		      (uintmax_t)ip->i_number,ip->i_usecount);
 	mtx_unlock(&ip->i_interlock);
 }
 
@@ -751,8 +756,8 @@
 {
 	struct fnode *fp;
 
-	dprintf(("ntfs_fget: ino: %d, attrtype: 0x%x, attrname: %s\n",
-		ip->i_number,attrtype, attrname?attrname:""));
+	dprintf(("ntfs_fget: ino: %ju, attrtype: 0x%x, attrname: %s\n",
+		(uintmax_t)ip->i_number,attrtype, attrname?attrname:""));
 	*fpp = NULL;
 	LIST_FOREACH(fp, &ip->i_fnlist, f_fnlist){
 		dprintf(("ntfs_fget: fnode: attrtype: %d, attrname: %s\n",
@@ -803,7 +808,8 @@
 {
 	struct ntnode *ip = FTONT(fp);
 
-	dprintf(("ntfs_frele: fnode: %p for %d: %p\n", fp, ip->i_number, ip));
+	dprintf(("ntfs_frele: fnode: %p for %ju: %p\n",
+	    fp, (uintmax_t)ip->i_number, ip));
 
 	dprintf(("ntfs_frele: deallocating fnode\n"));
 	LIST_REMOVE(fp,f_fnlist);
@@ -1133,7 +1139,8 @@
 	int             error = ENOENT;
 	u_int32_t       aoff, cnum;
 
-	dprintf(("ntfs_ntreaddir: read ino: %d, num: %d\n", ip->i_number, num));
+	dprintf(("ntfs_ntreaddir: read ino: %ju, num: %d\n",
+	    (uintmax_t)ip->i_number, num));
 	error = ntfs_ntget(ip);
 	if (error)
 		return (error);
@@ -1301,7 +1308,7 @@
 	struct ntvattr *vap;
 	int             error;
 
-	dprintf(("ntfs_times: ino: %d...\n", ip->i_number));
+	dprintf(("ntfs_times: ino: %ju...\n", (uintmax_t)ip->i_number));
 
 	error = ntfs_ntget(ip);
 	if (error)
@@ -1336,7 +1343,7 @@
 	u_int64_t       sz, bn;
 	int             error;
 
-	dprintf(("ntfs_filesize: ino: %d\n", ip->i_number));
+	dprintf(("ntfs_filesize: ino: %ju\n", (uintmax_t)ip->i_number));
 
 	error = ntfs_ntvattrget(ntmp, ip,
 		fp->f_attrtype, fp->f_attrname, 0, &vap);

Modified: soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vfsops.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -653,8 +653,8 @@
 	struct vnode *vp;
 	enum vtype f_type;
 
-	dprintf(("ntfs_vgetex: ino: %d, attr: 0x%x:%s, lkf: 0x%lx, f: 0x%lx\n",
-		ino, attrtype, attrname?attrname:"", (u_long)lkflags,
+	dprintf(("ntfs_vgetex: ino: %ju, attr: 0x%x:%s, lkf: 0x%lx, f: 0x%lx\n",
+		(uintmax_t)ino, attrtype, attrname?attrname:"", (u_long)lkflags,
 		(u_long)flags));
 
 	ntmp = VFSTONTFS(mp);
@@ -671,8 +671,8 @@
 	if (!(flags & VG_DONTLOADIN) && !(ip->i_flag & IN_LOADED)) {
 		error = ntfs_loadntnode(ntmp, ip);
 		if(error) {
-			printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO: %d\n",
-			       ip->i_number);
+			printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO: %ju\n",
+			       (uintmax_t)ip->i_number);
 			ntfs_ntput(ip);
 			return (error);
 		}
@@ -727,7 +727,7 @@
 		ntfs_ntput(ip);
 		return (error);
 	}
-	dprintf(("ntfs_vget: vnode: %p for ntnode: %d\n", vp,ino));
+	dprintf(("ntfs_vget: vnode: %p for ntnode: %ju\n", vp, (uintmax_t)ino));
 
 	fp->f_vp = vp;
 	vp->v_data = fp;

Modified: soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -129,7 +129,9 @@
 	int resid, off, toread;
 	int error;
 
-	dprintf(("ntfs_read: ino: %d, off: %d resid: %d, segflg: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid,uio->uio_segflg));
+	dprintf(("ntfs_read: ino: %ju, off: %jd resid: %zd, segflg: %d\n",
+	    (uintmax_t)ip->i_number, (intmax_t)uio->uio_offset,
+	    uio->uio_resid, uio->uio_segflg));
 
 	dprintf(("ntfs_read: filesize: %d",(u_int32_t)fp->f_size));
 
@@ -181,7 +183,8 @@
 	register struct ntnode *ip = FTONT(fp);
 	register struct vattr *vap = ap->a_vap;
 
-	dprintf(("ntfs_getattr: %d, flags: %d\n",ip->i_number,ip->i_flag));
+	dprintf(("ntfs_getattr: %ju, flags: %d\n",
+	    (uintmax_t)ip->i_number, ip->i_flag));
 
 	vap->va_fsid = dev2udev(ip->i_dev);
 	vap->va_fileid = ip->i_number;
@@ -216,8 +219,8 @@
 	register struct ntnode *ip = VTONT(ap->a_vp);
 #endif
 
-	dprintf(("ntfs_inactive: vnode: %p, ntnode: %d\n", ap->a_vp,
-	    ip->i_number));
+	dprintf(("ntfs_inactive: vnode: %p, ntnode: %ju\n",
+	    ap->a_vp, (uintmax_t)ip->i_number));
 
 	/* XXX since we don't support any filesystem changes
 	 * right now, nothing more needs to be done
@@ -239,7 +242,8 @@
 	register struct ntnode *ip = FTONT(fp);
 	int error;
 
-	dprintf(("ntfs_reclaim: vnode: %p, ntnode: %d\n", vp, ip->i_number));
+	dprintf(("ntfs_reclaim: vnode: %p, ntnode: %ju\n",
+	    vp, (uintmax_t)ip->i_number));
 
 	/*
 	 * Destroy the vm object and flush associated pages.
@@ -352,7 +356,9 @@
 	size_t written;
 	int error;
 
-	dprintf(("ntfs_write: ino: %d, off: %d resid: %d, segflg: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid,uio->uio_segflg));
+	dprintf(("ntfs_write: ino: %ju, off: %jd resid: %zd, segflg: %d\n",
+	    (uintmax_t)ip->i_number, (intmax_t)uio->uio_offset,
+	    uio->uio_resid, uio->uio_segflg));
 	dprintf(("ntfs_write: filesize: %d",(u_int32_t)fp->f_size));
 
 	if (uio->uio_resid + uio->uio_offset > fp->f_size) {
@@ -387,7 +393,7 @@
 	struct ntnode *ip = VTONT(vp);
 	accmode_t accmode = ap->a_accmode;
 
-	dprintf(("ntfs_access: %d\n",ip->i_number));
+	dprintf(("ntfs_access: %ju\n", (uintmax_t)ip->i_number));
 
 	/*
 	 * Disallow write attempts on read-only filesystems;
@@ -428,7 +434,7 @@
 	register struct vnode *vp = ap->a_vp;
 	register struct ntnode *ip = VTONT(vp);
 
-	printf("ntfs_open: %d\n",ip->i_number);
+	printf("ntfs_open: %ju\n", (uintmax_t)ip->i_number);
 #endif
 
 	vnode_create_vobject(ap->a_vp, VTOF(ap->a_vp)->f_size, ap->a_td);
@@ -459,7 +465,7 @@
 	register struct vnode *vp = ap->a_vp;
 	register struct ntnode *ip = VTONT(vp);
 
-	printf("ntfs_close: %d\n",ip->i_number);
+	printf("ntfs_close: %ju\n", (uintmax_t)ip->i_number);
 #endif
 
 	return (0);
@@ -487,7 +493,8 @@
 	struct dirent cde;
 	off_t off;
 
-	dprintf(("ntfs_readdir %d off: %d resid: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid));
+	dprintf(("ntfs_readdir %ju off: %jd resid: %zd\n",
+	    (uintmax_t)ip->i_number, (intmax_t)uio->uio_offset, uio->uio_resid));
 
 	off = uio->uio_offset;
 
@@ -563,10 +570,10 @@
 		}
 	}
 
-	dprintf(("ntfs_readdir: %d entries (%d bytes) read\n",
-		ncookies,(u_int)(uio->uio_offset - off)));
-	dprintf(("ntfs_readdir: off: %d resid: %d\n",
-		(u_int32_t)uio->uio_offset,uio->uio_resid));
+	dprintf(("ntfs_readdir: %d entries (%jd bytes) read\n",
+		ncookies, (intmax_t)(uio->uio_offset - off)));
+	dprintf(("ntfs_readdir: off: %jd resid: %zd\n",
+		(intmax_t)uio->uio_offset, uio->uio_resid));
 
 	if (!error && ap->a_ncookies != NULL) {
 		struct dirent* dpStart;
@@ -612,9 +619,9 @@
 	struct componentname *cnp = ap->a_cnp;
 	struct ucred *cred = cnp->cn_cred;
 	int error;
-	dprintf(("ntfs_lookup: \"%.*s\" (%ld bytes) in %d\n",
+	dprintf(("ntfs_lookup: \"%.*s\" (%ld bytes) in %ju\n",
 		(int)cnp->cn_namelen, cnp->cn_nameptr, cnp->cn_namelen,
-		dip->i_number));
+		(uintmax_t)dip->i_number));
 
 	error = VOP_ACCESS(dvp, VEXEC, cred, cnp->cn_thread);
 	if(error)
@@ -626,8 +633,8 @@
 		return (EROFS);
 
 	if(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
-		dprintf(("ntfs_lookup: faking . directory in %d\n",
-			dip->i_number));
+		dprintf(("ntfs_lookup: faking . directory in %ju\n",
+			(uintmax_t)dip->i_number));
 
 		VREF(dvp);
 		*ap->a_vpp = dvp;
@@ -635,8 +642,8 @@
 	} else if (cnp->cn_flags & ISDOTDOT) {
 		struct ntvattr *vap;
 
-		dprintf(("ntfs_lookup: faking .. directory in %d\n",
-			 dip->i_number));
+		dprintf(("ntfs_lookup: faking .. directory in %ju\n",
+			 (uintmax_t)dip->i_number));
 
 		error = ntfs_ntvattrget(ntmp, dip, NTFS_A_NAME, NULL, 0, &vap);
 		if(error)
@@ -659,8 +666,8 @@
 			return (error);
 		}
 
-		dprintf(("ntfs_lookup: found ino: %d\n", 
-			VTONT(*ap->a_vpp)->i_number));
+		dprintf(("ntfs_lookup: found ino: %ju\n",
+			(uintmax_t)VTONT(*ap->a_vpp)->i_number));
 	}
 
 	if (cnp->cn_flags & MAKEENTRY)

Modified: soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/fs/tmpfs/tmpfs_vfsops.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -240,7 +240,8 @@
 	    free(tmp, M_TMPFSMNT);
 	    return error;
 	}
-	KASSERT(root->tn_id == 2, ("tmpfs root with invalid ino: %d", root->tn_id));
+	KASSERT(root->tn_id == 2,
+	    ("tmpfs root with invalid ino: %ju", (uintmax_t)root->tn_id));
 	tmp->tm_root = root;
 
 	MNT_ILOCK(mp);

Modified: soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/kern/uipc_usrreq.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -2384,7 +2384,7 @@
 	db_printf("unp_socket: %p   unp_vnode: %p\n", unp->unp_socket,
 	    unp->unp_vnode);
 
-	db_printf("unp_ino: %d   unp_conn: %p\n", unp->unp_ino,
+	db_printf("unp_ino: %ju   unp_conn: %p\n", (uintmax_t)unp->unp_ino,
 	    unp->unp_conn);
 
 	db_printf("unp_refs:\n");

Modified: soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c
==============================================================================
--- soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/security/mac_lomac/mac_lomac.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -565,11 +565,11 @@
 	pgid = p->p_pgrp->pg_id;		/* XXX could be stale? */
 	if (vp != NULL && VOP_GETATTR(vp, &va, curthread->td_ucred) == 0) {
 		log(LOG_INFO, "LOMAC: level-%s subject p%dg%du%d:%s demoted to"
-		    " level %s after %s a level-%s %s (inode=%ld, "
+		    " level %s after %s a level-%s %s (inode=%ju, "
 		    "mountpount=%s)\n",
 		    subjlabeltext, p->p_pid, pgid, curthread->td_ucred->cr_uid,
 		    p->p_comm, subjtext, actionname, objlabeltext, objname,
-		    va.va_fileid, vp->v_mount->mnt_stat.f_mntonname);
+		    (uintmax_t)va.va_fileid, vp->v_mount->mnt_stat.f_mntonname);
 	} else {
 		log(LOG_INFO, "LOMAC: level-%s subject p%dg%du%d:%s demoted to"
 		    " level %s after %s a level-%s %s\n",

Modified: soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/ufs/ffs/ffs_alloc.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -598,7 +598,8 @@
 	 */
 #ifdef DEBUG
 	if (prtrealloc)
-		printf("realloc: ino %d, lbns %jd-%jd\n\told:", ip->i_number,
+		printf("realloc: ino %jd, lbns %jd-%jd\n\told:",
+		    (intmax_t)ip->i_number,
 		    (intmax_t)start_lbn, (intmax_t)end_lbn);
 #endif
 	blkno = newblk;
@@ -2185,8 +2186,8 @@
 	inosused = cg_inosused(cgp);
 	ino %= fs->fs_ipg;
 	if (isclr(inosused, ino)) {
-		printf("dev = %s, ino = %u, fs = %s\n", devtoname(dev),
-		    ino + cg * fs->fs_ipg, fs->fs_fsmnt);
+		printf("dev = %s, ino = %ju, fs = %s\n", devtoname(dev),
+		    (uintmax_t)(ino + cg * fs->fs_ipg), fs->fs_fsmnt);
 		if (fs->fs_ronly == 0)
 			panic("ffs_freefile: freeing free inode");
 	}
@@ -2336,8 +2337,9 @@
 	struct thread *td = curthread;	/* XXX */
 	struct proc *p = td->td_proc;
 
-	log(LOG_ERR, "pid %d (%s), uid %d inumber %d on %s: %s\n",
-	    p->p_pid, p->p_comm, td->td_ucred->cr_uid, inum, fs->fs_fsmnt, cp);
+	log(LOG_ERR, "pid %d (%s), uid %d inumber %ju on %s: %s\n",
+	    p->p_pid, p->p_comm, td->td_ucred->cr_uid, (uintmax_t)inum,
+	    fs->fs_fsmnt, cp);
 }
 
 /*

Modified: soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/ufs/ffs/ffs_snapshot.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -681,7 +681,7 @@
 	VI_LOCK(devvp);
 	fs->fs_snapinum[snaploc] = ip->i_number;
 	if (ip->i_nextsnap.tqe_prev != 0)
-		panic("ffs_snapshot: %d already on list", ip->i_number);
+		panic("ffs_snapshot: %ju already on list", (uintmax_t)ip->i_number);
 	TAILQ_INSERT_TAIL(&sn->sn_head, ip, i_nextsnap);
 	devvp->v_vflag |= VV_COPYONWRITE;
 	VI_UNLOCK(devvp);
@@ -1561,8 +1561,8 @@
 	if (xp != NULL)
 		vrele(ITOV(ip));
 	else if (snapdebug)
-		printf("ffs_snapgone: lost snapshot vnode %d\n",
-		    ip->i_number);
+		printf("ffs_snapgone: lost snapshot vnode %ju\n",
+		    (uintmax_t)ip->i_number);
 	/*
 	 * Delete snapshot inode from superblock. Keep list dense.
 	 */
@@ -1821,9 +1821,10 @@
 		if (size == fs->fs_bsize) {
 #ifdef DEBUG
 			if (snapdebug)
-				printf("%s %d lbn %jd from inum %d\n",
-				    "Grabonremove: snapino", ip->i_number,
-				    (intmax_t)lbn, inum);
+				printf("%s %ju lbn %jd from inum %ju\n",
+				    "Grabonremove: snapino",
+				    (uintmax_t)ip->i_number, (intmax_t)lbn,
+				    (uintmax_t)inum);
 #endif
 			if (lbn < NDADDR) {
 				DIP_SET(ip, i_db[lbn], bno);
@@ -1854,9 +1855,9 @@
 			break;
 #ifdef DEBUG
 		if (snapdebug)
-			printf("%s%d lbn %jd %s %d size %ld to blkno %jd\n",
-			    "Copyonremove: snapino ", ip->i_number,
-			    (intmax_t)lbn, "for inum", inum, size,
+			printf("%s%ju lbn %jd %s %ju size %ld to blkno %jd\n",
+			    "Copyonremove: snapino ", (uintmax_t)ip->i_number,
+			    (intmax_t)lbn, "for inum", (uintmax_t)inum, size,
 			    (intmax_t)cbp->b_blkno);
 #endif
 		/*
@@ -1986,8 +1987,8 @@
 		 */
 		VI_LOCK(devvp);
 		if (ip->i_nextsnap.tqe_prev != 0)
-			panic("ffs_snapshot_mount: %d already on list",
-			    ip->i_number);
+			panic("ffs_snapshot_mount: %ju already on list",
+			    (uintmax_t)ip->i_number);
 		else
 			TAILQ_INSERT_TAIL(&sn->sn_head, ip, i_nextsnap);
 		vp->v_vflag |= VV_SYSTEM;
@@ -2331,12 +2332,13 @@
 			break;
 #ifdef DEBUG
 		if (snapdebug) {
-			printf("Copyonwrite: snapino %d lbn %jd for ",
-			    ip->i_number, (intmax_t)lbn);
+			printf("Copyonwrite: snapino %ju lbn %jd for ",
+			    (intmax_t)ip->i_number, (intmax_t)lbn);
 			if (bp->b_vp == devvp)
 				printf("fs metadata");
 			else
-				printf("inum %d", VTOI(bp->b_vp)->i_number);
+				printf("inum %ju",
+				    (uintmax_t)VTOI(bp->b_vp)->i_number);
 			printf(" lblkno %jd to blkno %jd\n",
 			    (intmax_t)bp->b_lblkno, (intmax_t)cbp->b_blkno);
 		}

Modified: soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/ufs/ffs/ffs_softdep.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -4119,8 +4119,8 @@
 		KASSERT(jaddref != NULL,
 		    ("softdep_setup_mkdir: No addref structure present."));
 		KASSERT(jaddref->ja_parent == dp->i_number, 
-		    ("softdep_setup_mkdir: bad parent %d",
-		    jaddref->ja_parent));
+		    ("softdep_setup_mkdir: bad parent %ju",
+		    (uintmax_t)jaddref->ja_parent));
 		jaddref->ja_mode = ip->i_mode;
 		TAILQ_INSERT_BEFORE(&jaddref->ja_ref, &dotaddref->ja_ref,
 		    if_deps);
@@ -7580,8 +7580,8 @@
 	if ((dap->da_state & ATTACHED) == 0)
 		panic("newdirrem: not ATTACHED");
 	if (dap->da_newinum != ip->i_number)
-		panic("newdirrem: inum %d should be %d",
-		    ip->i_number, dap->da_newinum);
+		panic("newdirrem: inum %ju should be %ju",
+		    (uintmax_t)ip->i_number, (uintmax_t)dap->da_newinum);
 	/*
 	 * If we are deleting a changed name that never made it to disk,
 	 * then return the dirrem describing the previous inode (which
@@ -8474,9 +8474,10 @@
 			ep = (struct direct *)
 			    ((char *)bp->b_data + dap->da_offset);
 			if (ep->d_ino != dap->da_newinum)
-				panic("%s: dir inum %d != new %d",
+				panic("%s: dir inum %ju != new %ju",
 				    "initiate_write_filepage",
-				    ep->d_ino, dap->da_newinum);
+				    (uintmax_t)ep->d_ino,
+				    (uintmax_t)dap->da_newinum);
 			if (dap->da_state & DIRCHG)
 				ep->d_ino = dap->da_previous->dm_oldinum;
 			else
@@ -8705,9 +8706,10 @@
 		inon = TAILQ_NEXT(inodedep, id_unlinked);
 		freelink = inon ? inon->id_ino : 0;
 		if (freelink != dp->di_freelink)
-			panic("ino %p(0x%X) %d, %d != %d",
-			    inodedep, inodedep->id_state, inodedep->id_ino,
-			    freelink, dp->di_freelink);
+			panic("ino %p(0x%X) %ju, %ju != %ju",
+			    inodedep, inodedep->id_state,
+			    (uintmax_t)inodedep->id_ino,
+			    (uintmax_t)freelink, (uintmax_t)dp->di_freelink);
 	}
 	/*
 	 * If the bitmap is not yet written, then the allocated
@@ -9029,10 +9031,11 @@
 	cgp = (struct cg *)bp->b_data;
 	inosused = cg_inosused(cgp);
 	if (isset(inosused, ino % fs->fs_ipg))
-		panic("softdep_setup_inofree: inode %d not freed.", ino);
+		panic("softdep_setup_inofree: inode %ju not freed.",
+		    (uintmax_t)ino);
 	if (inodedep_lookup(mp, ino, 0, &inodedep))
-		panic("softdep_setup_inofree: ino %d has existing inodedep %p",
-		    ino, inodedep);
+		panic("softdep_setup_inofree: ino %ju has existing inodedep %p",
+		    (uintmax_t)ino, inodedep);
 	if (wkhd) {
 		LIST_FOREACH_SAFE(wk, wkhd, wk_list, wkn) {
 			if (wk->wk_type != D_JADDREF)
@@ -9199,8 +9202,8 @@
 				jaddref->ja_state |= UNDONE;
 				stat_jaddref++;
 			} else if ((bp->b_xflags & BX_BKGRDMARKER) == 0)
-				panic("initiate_write_bmsafemap: inode %d "
-				    "marked free", jaddref->ja_ino);
+				panic("initiate_write_bmsafemap: inode %ju "
+				    "marked free", (uintmax_t)jaddref->ja_ino);
 		}
 	}
 	/*
@@ -11192,7 +11195,8 @@
 		if (dap == LIST_FIRST(diraddhdp)) {
 			inodedep_lookup(UFSTOVFS(ump), inum, 0, &inodedep);
 			panic("flush_pagedep_deps: failed to flush " 
-			    "inodedep %p ino %d dap %p", inodedep, inum, dap);
+			    "inodedep %p ino %ju dap %p",
+			    inodedep, (uintmax_t)inum, dap);
 		}
 	}
 	if (error)

Modified: soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c
==============================================================================
--- soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/ufs/ufs/ufs_acl.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -182,8 +182,8 @@
 		 * are unsafe.
 		 */
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL ("
-		    "%d bytes), inumber %d on %s\n", len,
-		    ip->i_number, ip->i_fs->fs_fsmnt);
+		    "%d bytes), inumber %ju on %s\n", len,
+		    (uintmax_t)ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);
 	}
@@ -191,8 +191,8 @@
 	error = acl_nfs4_check(aclp, vp->v_type == VDIR);
 	if (error) {
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL "
-		    "(failed acl_nfs4_check), inumber %d on %s\n",
-		    ip->i_number, ip->i_fs->fs_fsmnt);
+		    "(failed acl_nfs4_check), inumber %ju on %s\n",
+		    (uintmax_t)ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);
 	}
@@ -259,8 +259,8 @@
 		 * DAC protections are unsafe.
 		 */
 		printf("ufs_get_oldacl(): Loaded invalid ACL "
-		    "(len = %d), inumber %d on %s\n", len,
-		    ip->i_number, ip->i_fs->fs_fsmnt);
+		    "(len = %d), inumber %ju on %s\n", len,
+		    (uintmax_t)ip->i_number, ip->i_fs->fs_fsmnt);
 		return (EPERM);
 	}
 

Modified: soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c
==============================================================================
--- soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/ufs/ufs/ufs_lookup.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -1209,8 +1209,8 @@
 		ufsdirhash_remove(dp, rep, dp->i_offset);
 #endif
 	if (ip && rep->d_ino != ip->i_number)
-		panic("ufs_dirremove: ip %d does not match dirent ino %d\n",
-		    ip->i_number, rep->d_ino);
+		panic("ufs_dirremove: ip %ju does not match dirent ino %ju\n",
+		    (uintmax_t)ip->i_number, (uintmax_t)rep->d_ino);
 	if (dp->i_count == 0) {
 		/*
 		 * First entry in block: set d_ino to zero.

Modified: soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c	Sun Jun  5 16:20:10 2011	(r222839)
+++ soc2011/gk/ino64-head/sys/ufs/ufs/ufs_vnops.c	Sun Jun  5 16:20:38 2011	(r222840)
@@ -1485,8 +1485,8 @@
 		if (error)
 			panic("ufs_rename: from entry went away!");
 		if (ino != fip->i_number)
-			panic("ufs_rename: ino mismatch %d != %d\n", ino,
-			    fip->i_number);
+			panic("ufs_rename: ino mismatch %ju != %ju\n",
+			    (uintmax_t)ino, (uintmax_t)fip->i_number);
 	}
 	/*
 	 * If the source is a directory with a

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:21:18 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 70E76106566C
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:21:16 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:21:16 +0000
Date: Sun, 05 Jun 2011 16:21:16 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162116.70E76106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222841 - in soc2011/gk/ino64-head: bin/ls bin/rm
	sbin/dump sbin/fsck_ffs sbin/fsdb sbin/fsirand sbin/growfs
	sbin/newfs sbin/quotacheck sbin/restore sbin/tunefs
	usr.bin/find usr.sbin...
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:21:18 -0000

Author: gk
Date: Sun Jun  5 16:21:16 2011
New Revision: 222841
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222841

Log:
  usr: Change ino_t printf format flag to %ju

Modified:
  soc2011/gk/ino64-head/bin/ls/ls.c
  soc2011/gk/ino64-head/bin/ls/print.c
  soc2011/gk/ino64-head/bin/rm/rm.c
  soc2011/gk/ino64-head/sbin/dump/traverse.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/fsutil.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/gjournal.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/inode.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/main.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/pass1.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/pass2.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/pass4.c
  soc2011/gk/ino64-head/sbin/fsck_ffs/suj.c
  soc2011/gk/ino64-head/sbin/fsdb/fsdb.c
  soc2011/gk/ino64-head/sbin/fsdb/fsdbutil.c
  soc2011/gk/ino64-head/sbin/fsirand/fsirand.c
  soc2011/gk/ino64-head/sbin/growfs/growfs.c
  soc2011/gk/ino64-head/sbin/newfs/mkfs.c
  soc2011/gk/ino64-head/sbin/quotacheck/quotacheck.c
  soc2011/gk/ino64-head/sbin/restore/dirs.c
  soc2011/gk/ino64-head/sbin/restore/interactive.c
  soc2011/gk/ino64-head/sbin/restore/restore.c
  soc2011/gk/ino64-head/sbin/restore/symtab.c
  soc2011/gk/ino64-head/sbin/restore/tape.c
  soc2011/gk/ino64-head/sbin/tunefs/tunefs.c
  soc2011/gk/ino64-head/usr.bin/find/ls.c
  soc2011/gk/ino64-head/usr.sbin/lpr/lpr/lpr.c
  soc2011/gk/ino64-head/usr.sbin/makefs/ffs/ffs_alloc.c
  soc2011/gk/ino64-head/usr.sbin/quot/quot.c
  soc2011/gk/ino64-head/usr.sbin/snapinfo/snapinfo.c

Modified: soc2011/gk/ino64-head/bin/ls/ls.c
==============================================================================
--- soc2011/gk/ino64-head/bin/ls/ls.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/bin/ls/ls.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -561,7 +561,8 @@
 	NAMES *np;
 	off_t maxsize;
 	long maxblock;
-	u_long btotal, labelstrlen, maxinode, maxlen, maxnlink;
+	uintmax_t maxinode;
+	u_long btotal, labelstrlen, maxlen, maxnlink;
 	u_long maxlabelstr;
 	u_int devstrlen;
 	int maxflags;
@@ -581,8 +582,9 @@
 	btotal = 0;
 	initmax = getenv("LS_COLWIDTHS");
 	/* Fields match -lios order.  New ones should be added at the end. */
-	maxlabelstr = maxblock = maxinode = maxlen = maxnlink =
-	    maxuser = maxgroup = maxflags = maxsize = 0;
+	maxlabelstr = maxblock = maxlen = maxnlink = 0;
+	maxuser = maxgroup = maxflags = maxsize = 0;
+	maxinode = 0;
 	if (initmax != NULL && *initmax != '\0') {
 		char *initmax2, *jinitmax;
 		int ninitmax;
@@ -610,7 +612,7 @@
 			strcpy(initmax2, "0");
 
 		ninitmax = sscanf(jinitmax,
-		    " %lu : %ld : %lu : %u : %u : %i : %jd : %lu : %lu ",
+		    " %ju : %ld : %lu : %u : %u : %i : %jd : %lu : %lu ",
 		    &maxinode, &maxblock, &maxnlink, &maxuser,
 		    &maxgroup, &maxflags, &maxsize, &maxlen, &maxlabelstr);
 		f_notabs = 1;
@@ -842,7 +844,7 @@
 		d.s_flags = maxflags;
 		d.s_label = maxlabelstr;
 		d.s_group = maxgroup;
-		(void)snprintf(buf, sizeof(buf), "%lu", maxinode);
+		(void)snprintf(buf, sizeof(buf), "%ju", maxinode);
 		d.s_inode = strlen(buf);
 		(void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
 		d.s_nlink = strlen(buf);

Modified: soc2011/gk/ino64-head/bin/ls/print.c
==============================================================================
--- soc2011/gk/ino64-head/bin/ls/print.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/bin/ls/print.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -40,6 +40,7 @@
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/stdint.h>
 #include <sys/acl.h>
 
 #include <err.h>
@@ -151,7 +152,8 @@
 			continue;
 		sp = p->fts_statp;
 		if (f_inode)
-			(void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino);
+			(void)printf("%*ju ",
+			    dp->s_inode, (uintmax_t)sp->st_ino);
 		if (f_size)
 			(void)printf("%*jd ",
 			    dp->s_block, howmany(sp->st_blocks, blocksize));
@@ -327,7 +329,8 @@
 	sp = p->fts_statp;
 	chcnt = 0;
 	if (f_inode)
-		chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino);
+		chcnt += printf("%*ju ",
+		    (int)inodefield, (uintmax_t)sp->st_ino);
 	if (f_size)
 		chcnt += printf("%*jd ",
 		    (int)sizefield, howmany(sp->st_blocks, blocksize));

Modified: soc2011/gk/ino64-head/bin/rm/rm.c
==============================================================================
--- soc2011/gk/ino64-head/bin/rm/rm.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/bin/rm/rm.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -42,6 +42,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/stat.h>
+#include <sys/stdint.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 
@@ -423,8 +424,8 @@
 	if (!S_ISREG(sbp->st_mode))
 		return (1);
 	if (sbp->st_nlink > 1 && !fflag) {
-		warnx("%s (inode %u): not overwritten due to multiple links",
-		    file, sbp->st_ino);
+		warnx("%s (inode %ju): not overwritten due to multiple links",
+		    file, (uintmax_t)sbp->st_ino);
 		return (0);
 	}
 	if ((fd = open(file, O_WRONLY, 0)) == -1)

Modified: soc2011/gk/ino64-head/sbin/dump/traverse.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/dump/traverse.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/dump/traverse.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -197,8 +197,8 @@
 			    (mode & IFMT) == 0)
 				continue;
 			if (ino >= maxino) {
-				msg("Skipping inode %d >= maxino %d\n",
-				    ino, maxino);
+				msg("Skipping inode %ju >= maxino %ju\n",
+				    (uintmax_t)ino, (uintmax_t)maxino);
 				continue;
 			}
 			/*
@@ -400,15 +400,16 @@
 	for (loc = 0; loc < size; ) {
 		dp = (struct direct *)(dblk + loc);
 		if (dp->d_reclen == 0) {
-			msg("corrupted directory, inumber %d\n", ino);
+			msg("corrupted directory, inumber %ju\n",
+			    (uintmax_t)ino);
 			break;
 		}
 		loc += dp->d_reclen;
 		if (dp->d_ino == 0)
 			continue;
 		if (dp->d_ino >= maxino) {
-			msg("corrupted directory entry, d_ino %d >= %d\n",
-			    dp->d_ino, maxino);
+			msg("corrupted directory entry, d_ino %ju >= %ju\n",
+			    (uintmax_t)dp->d_ino, (uintmax_t)maxino);
 			break;
 		}
 		if (dp->d_name[0] == '.') {

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/fsutil.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/fsutil.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/fsutil.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -137,7 +137,8 @@
 	int iloff;
 
 	if (inum > maxino)
-		errx(EEXIT, "inoinfo: inumber %d out of range", inum);
+		errx(EEXIT, "inoinfo: inumber %ju out of range",
+		    (uintmax_t)inum);
 	ilp = &inostathead[inum / sblock.fs_ipg];
 	iloff = inum % sblock.fs_ipg;
 	if (iloff >= ilp->il_numalloced)

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/gjournal.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/gjournal.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/gjournal.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -449,7 +449,8 @@
 			if (isclr(inosused, cino))
 				continue;
 			if (getino(disk, &p, ino, &mode) == -1)
-				err(1, "getino(cg=%d ino=%d)", cg, ino);
+				err(1, "getino(cg=%d ino=%ju)",
+				    cg, (uintmax_t)ino);
 			dino = p;
 			/* Not a regular file nor directory? Skip it. */
 			if (!S_ISREG(dino->di_mode) && !S_ISDIR(dino->di_mode))
@@ -481,7 +482,8 @@
 			*dino = ufs2_zino;
 			/* Write the inode back. */
 			if (putino(disk) == -1)
-				err(1, "putino(cg=%d ino=%d)", cg, ino);
+				err(1, "putino(cg=%d ino=%ju)",
+				    cg, (uintmax_t)ino);
 			if (cgp->cg_unrefs == 0) {
 				//printf("No more unreferenced inodes in cg=%d.\n", cg);
 				break;

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/inode.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/inode.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/inode.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -285,7 +285,8 @@
 	ufs2_daddr_t iblk;
 
 	if (inumber < ROOTINO || inumber > maxino)
-		errx(EEXIT, "bad inode number %d to ginode", inumber);
+		errx(EEXIT, "bad inode number %ju to ginode",
+		    (uintmax_t)inumber);
 	if (startinum == 0 ||
 	    inumber < startinum || inumber >= startinum + INOPB(&sblock)) {
 		iblk = ino_to_fsba(&sblock, inumber);
@@ -319,7 +320,8 @@
 	static caddr_t nextinop;
 
 	if (inumber != nextino++ || inumber > lastvalidinum)
-		errx(EEXIT, "bad inode number %d to nextinode", inumber);
+		errx(EEXIT, "bad inode number %ju to nextinode",
+		    (uintmax_t)inumber);
 	if (inumber >= lastinum) {
 		readcnt++;
 		dblk = fsbtodb(&sblock, ino_to_fsba(&sblock, lastinum));
@@ -398,7 +400,8 @@
 {
 
 	if (inum % sblock.fs_ipg != 0)
-		errx(EEXIT, "bad inode number %d to setinodebuf", inum);
+		errx(EEXIT, "bad inode number %ju to setinodebuf",
+		    (uintmax_t)inum);
 	lastvalidinum = inum + sblock.fs_ipg - 1;
 	startinum = 0;
 	nextino = inum;
@@ -489,7 +492,7 @@
 			continue;
 		return (inp);
 	}
-	errx(EEXIT, "cannot find inode %d", inumber);
+	errx(EEXIT, "cannot find inode %ju", (uintmax_t)inumber);
 	return ((struct inoinfo *)0);
 }
 

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/main.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/main.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/main.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -493,7 +493,7 @@
 	    n_ffree * 100.0 / sblock.fs_dsize);
 	if (debug) {
 		if (files < 0)
-			printf("%d inodes missing\n", -files);
+			printf("%jd inodes missing\n", (intmax_t)-files);
 		if (blks < 0)
 			printf("%lld blocks missing\n", -(long long)blks);
 		if (duplist != NULL) {

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/pass1.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/pass1.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/pass1.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -99,8 +99,9 @@
 		if (!rebuildcg && sblock.fs_magic == FS_UFS2_MAGIC) {
 			inosused = cgrp.cg_initediblk;
 			if (inosused > sblock.fs_ipg) {
-				pfatal("%s (%d > %d) %s %d\nReset to %d\n",
-				    "Too many initialized inodes", inosused,
+				pfatal("%s (%ju > %d) %s %d\nReset to %d\n",
+				    "Too many initialized inodes",
+				    (uintmax_t)inosused,
 				    sblock.fs_ipg, "in cylinder group", c,
 				    sblock.fs_ipg);
 				inosused = sblock.fs_ipg;

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/pass2.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/pass2.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/pass2.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -223,13 +223,14 @@
 		 *    inp->i_parent is directory to which ".." should point.
 		 */
 		getpathname(pathbuf, inp->i_parent, inp->i_number);
-		printf("BAD INODE NUMBER FOR '..' in DIR I=%d (%s)\n",
-		    inp->i_number, pathbuf);
+		printf("BAD INODE NUMBER FOR '..' in DIR I=%ju (%s)\n",
+		    (uintmax_t)inp->i_number, pathbuf);
 		getpathname(pathbuf, inp->i_dotdot, inp->i_dotdot);
-		printf("CURRENTLY POINTS TO I=%d (%s), ", inp->i_dotdot,
-		    pathbuf);
+		printf("CURRENTLY POINTS TO I=%ju (%s), ",
+		    (uintmax_t)inp->i_dotdot, pathbuf);
 		getpathname(pathbuf, inp->i_parent, inp->i_parent);
-		printf("SHOULD POINT TO I=%d (%s)", inp->i_parent, pathbuf);
+		printf("SHOULD POINT TO I=%ju (%s)",
+		    (uintmax_t)inp->i_parent, pathbuf);
 		if (cursnapshot != 0) {
 			/*
 			 * We need to:
@@ -443,8 +444,8 @@
 			} else {
 				getpathname(dirname, idesc->id_number,
 				    dirp->d_ino);
-				pwarn("ZERO LENGTH DIRECTORY %s I=%d",
-					dirname, dirp->d_ino);
+				pwarn("ZERO LENGTH DIRECTORY %s I=%ju",
+					dirname, (uintmax_t)dirp->d_ino);
 				/*
 				 * We need to:
 				 *    setcwd(idesc->id_parent);
@@ -507,8 +508,9 @@
 			break;
 
 		default:
-			errx(EEXIT, "BAD STATE %d FOR INODE I=%d",
-			    inoinfo(dirp->d_ino)->ino_state, dirp->d_ino);
+			errx(EEXIT, "BAD STATE %d FOR INODE I=%ju",
+			    inoinfo(dirp->d_ino)->ino_state,
+			    (uintmax_t)dirp->d_ino);
 		}
 	}
 	if (n == 0)

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/pass4.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/pass4.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/pass4.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -36,6 +36,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/stdint.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
@@ -114,8 +115,9 @@
 				break;
 
 			default:
-				errx(EEXIT, "BAD STATE %d FOR INODE I=%d",
-				    inoinfo(inumber)->ino_state, inumber);
+				errx(EEXIT, "BAD STATE %d FOR INODE I=%ju",
+				    inoinfo(inumber)->ino_state,
+				    (uintmax_t)inumber);
 			}
 		}
 	}

Modified: soc2011/gk/ino64-head/sbin/fsck_ffs/suj.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsck_ffs/suj.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsck_ffs/suj.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -831,8 +831,8 @@
 	int doff;
 
 	if (debug)
-		printf("Clearing inode %d from parent %d at offset %jd\n",
-		    child, parent, diroff);
+		printf("Clearing inode %ju from parent %ju at offset %jd\n",
+		    (uintmax_t)child, (uintmax_t)parent, diroff);
 
 	lbn = lblkno(fs, diroff);
 	doff = blkoff(fs, diroff);
@@ -842,8 +842,8 @@
 	block = dblk_read(blk, blksize);
 	dp = (struct direct *)&block[doff];
 	if (dp->d_ino != child)
-		errx(1, "Inode %d does not exist in %d at %jd",
-		    child, parent, diroff);
+		errx(1, "Inode %ju does not exist in %ju at %jd",
+		    (uintmax_t)child, (uintmax_t)parent, diroff);
 	dp->d_ino = 0;
 	dblk_dirty(blk);
 	/*
@@ -879,10 +879,11 @@
 			 * was reallocated.
 			 */
 			if (*mode != 0)
-				printf("Directory %d has bad mode %o\n",
-				    parent, *mode);
+				printf("Directory %ju has bad mode %o\n",
+				    (uintmax_t)parent, *mode);
 			else
-				printf("Directory %d zero inode\n", parent);
+				printf("Directory %ju zero inode\n",
+				    (uintmax_t)parent);
 		}
 		return (0);
 	}
@@ -891,15 +892,16 @@
 	blksize = sblksize(fs, DIP(dip, di_size), lbn);
 	if (diroff + DIRECTSIZ(1) > DIP(dip, di_size) || doff >= blksize) {
 		if (debug)
-			printf("ino %d absent from %d due to offset %jd"
+			printf("ino %ju absent from %ju due to offset %jd"
 			    " exceeding size %jd\n",
-			    child, parent, diroff, DIP(dip, di_size));
+			    (uintmax_t)child, (uintmax_t)parent, diroff,
+			    DIP(dip, di_size));
 		return (0);
 	}
 	blk = ino_blkatoff(dip, parent, lbn, &frags);
 	if (blk <= 0) {
 		if (debug)
-			printf("Sparse directory %d", parent);
+			printf("Sparse directory %ju", (uintmax_t)parent);
 		return (0);
 	}
 	block = dblk_read(blk, blksize);
@@ -918,12 +920,13 @@
 		dpoff += dp->d_reclen;
 	} while (dpoff <= doff);
 	if (dpoff > fs->fs_bsize)
-		err_suj("Corrupt directory block in dir ino %d\n", parent);
+		err_suj("Corrupt directory block in dir ino %ju\n",
+		    (uintmax_t)parent);
 	/* Not found. */
 	if (dpoff != doff) {
 		if (debug)
-			printf("ino %d not found in %d, lbn %jd, dpoff %d\n",
-			    child, parent, lbn, dpoff);
+			printf("ino %ju not found in %ju, lbn %jd, dpoff %d\n",
+			    (uintmax_t)child, (uintmax_t)parent, lbn, dpoff);
 		return (0);
 	}
 	/*
@@ -940,8 +943,8 @@
 		return (1);
 	}
 	if (debug)
-		printf("ino %d doesn't match dirent ino %d in parent %d\n",
-		    child, dp->d_ino, parent);
+		printf("ino %ju doesn't match dirent ino %ju in parent %ju\n",
+		    (uintmax_t)child, (uintmax_t)dp->d_ino, (uintmax_t)parent);
 	return (0);
 }
 
@@ -977,8 +980,8 @@
 		err_suj("Invalid level for lbn %jd\n", lbn);
 	if ((flags & VISIT_ROOT) == 0 && blk_isindir(blk, ino, lbn) == 0) {
 		if (debug)
-			printf("blk %jd ino %d lbn %jd(%d) is not indir.\n",
-			    blk, ino, lbn, level);
+			printf("blk %jd ino %ju lbn %jd(%d) is not indir.\n",
+			    blk, (uintmax_t)ino, lbn, level);
 		goto out;
 	}
 	lbnadd = 1;
@@ -1131,8 +1134,8 @@
 	if (blocks == DIP(ip, di_blocks))
 		return;
 	if (debug)
-		printf("ino %d adjusting block count from %jd to %jd\n",
-		    ino, DIP(ip, di_blocks), blocks);
+		printf("ino %ju adjusting block count from %jd to %jd\n",
+		    (uintmax_t)ino, DIP(ip, di_blocks), blocks);
 	DIP_SET(ip, di_blocks, blocks);
 	ino_dirty(ino);
 }
@@ -1264,8 +1267,8 @@
 		if (isdotdot && skipparent == 1)
 			continue;
 		if (debug)
-			printf("Directory %d removing ino %d name %s\n",
-			    ino, dp->d_ino, dp->d_name);
+			printf("Directory %ju removing ino %ju name %s\n",
+			    (uintmax_t)ino, (uintmax_t)dp->d_ino, dp->d_name);
 		diroff = lblktosize(fs, lbn) + dpoff;
 		ino_remref(ino, dp->d_ino, diroff, isdotdot);
 	}
@@ -1283,8 +1286,8 @@
 	if (ino == ROOTINO)
 		err_suj("Attempting to free ROOTINO\n");
 	if (debug)
-		printf("Truncating and freeing ino %d, nlink %d, mode %o\n",
-		    ino, DIP(ip, di_nlink), DIP(ip, di_mode));
+		printf("Truncating and freeing ino %ju, nlink %d, mode %o\n",
+		    (uintmax_t)ino, DIP(ip, di_nlink), DIP(ip, di_mode));
 
 	/* We are freeing an inode or directory. */
 	if ((DIP(ip, di_mode) & IFMT) == IFDIR)
@@ -1328,8 +1331,8 @@
 		reqlink = 1;
 	if (nlink < reqlink) {
 		if (debug)
-			printf("ino %d not enough links to live %d < %d\n",
-			    ino, nlink, reqlink);
+			printf("ino %ju not enough links to live %d < %d\n",
+			    (uintmax_t)ino, nlink, reqlink);
 		ino_reclaim(ip, ino, mode);
 		return;
 	}
@@ -1374,7 +1377,7 @@
 			break;
 		}
 		if (srec == NULL)
-			errx(1, "Directory %d name not found", ino);
+			errx(1, "Directory %ju name not found", (uintmax_t)ino);
 	}
 	/*
 	 * If it's a directory with no real names pointing to it go ahead
@@ -1402,17 +1405,19 @@
 		    "ino %d nlink manipulation error, new link %d, old link %d\n",
 		    ino, nlink, DIP(ip, di_nlink));
 	if (debug)
-		printf("Adjusting ino %d, nlink %d, old link %d lastmode %o\n",
-		    ino, nlink, DIP(ip, di_nlink), sino->si_mode);
+		printf("Adjusting ino %ju, nlink %d, old link %d lastmode %o\n",
+		    (uintmax_t)ino, nlink, DIP(ip, di_nlink), sino->si_mode);
 	if (mode == 0) {
 		if (debug)
-			printf("ino %d, zero inode freeing bitmap\n", ino);
+			printf("ino %ju, zero inode freeing bitmap\n",
+			    (uintmax_t)ino);
 		ino_free(ino, sino->si_mode);
 		return;
 	}
 	/* XXX Should be an assert? */
 	if (mode != sino->si_mode && debug)
-		printf("ino %d, mode %o != %o\n", ino, mode, sino->si_mode);
+		printf("ino %ju, mode %o != %o\n",
+		    (uintmax_t)ino, mode, sino->si_mode);
 	if ((mode & IFMT) == IFDIR)
 		reqlink = 2;
 	else
@@ -1420,15 +1425,16 @@
 	/* If the inode doesn't have enough links to live, free it. */
 	if (nlink < reqlink) {
 		if (debug)
-			printf("ino %d not enough links to live %d < %d\n",
-			    ino, nlink, reqlink);
+			printf("ino %ju not enough links to live %d < %d\n",
+			    (uintmax_t)ino, nlink, reqlink);
 		ino_reclaim(ip, ino, mode);
 		return;
 	}
 	/* If required write the updated link count. */
 	if (DIP(ip, di_nlink) == nlink) {
 		if (debug)
-			printf("ino %d, link matches, skipping.\n", ino);
+			printf("ino %ju, link matches, skipping.\n",
+			    (uintmax_t)ino);
 		return;
 	}
 	DIP_SET(ip, di_nlink, nlink);
@@ -1527,8 +1533,8 @@
 	mode = DIP(ip, di_mode) & IFMT;
 	cursize = DIP(ip, di_size);
 	if (debug)
-		printf("Truncating ino %d, mode %o to size %jd from size %jd\n",
-		    ino, mode, size, cursize);
+		printf("Truncating ino %ju, mode %o to size %jd from size %jd\n",
+		    (uintmax_t)ino, mode, size, cursize);
 
 	/* Skip datablocks for short links and devices. */
 	if (mode == 0 || mode == IFBLK || mode == IFCHR ||
@@ -1676,8 +1682,8 @@
 	 * by one.
 	 */
 	if (debug)
-		printf("ino %d nlink %d newlinks %d removes %d dotlinks %d\n",
-		    ino, nlink, newlinks, removes, dotlinks);
+		printf("ino %ju nlink %d newlinks %d removes %d dotlinks %d\n",
+		    (uintmax_t)ino, nlink, newlinks, removes, dotlinks);
 	nlink += newlinks;
 	nlink -= removes;
 	sino->si_linkadj = 1;
@@ -1928,12 +1934,12 @@
 		 */
 		if (DIP(ip, di_nlink) == 0) {
 			if (debug)
-				printf("Freeing unlinked ino %d mode %o\n",
-				    ino, mode);
+				printf("Freeing unlinked ino %ju mode %o\n",
+				    (uintmax_t)ino, mode);
 			ino_reclaim(ip, ino, mode);
 		} else if (debug)
-			printf("Skipping ino %d mode %o with link %d\n",
-			    ino, mode, DIP(ip, di_nlink));
+			printf("Skipping ino %ju mode %o with link %d\n",
+			    (uintmax_t)ino, mode, DIP(ip, di_nlink));
 		ino = inon;
 	}
 }
@@ -2370,27 +2376,27 @@
 {
 
 	if (DIP(ip, di_nlink) != 1) {
-		printf("Invalid link count %d for journal inode %d\n",
-		    DIP(ip, di_nlink), sujino);
+		printf("Invalid link count %d for journal inode %ju\n",
+		    DIP(ip, di_nlink), (uintmax_t)sujino);
 		return (-1);
 	}
 
 	if ((DIP(ip, di_flags) & (SF_IMMUTABLE | SF_NOUNLINK)) !=
 	    (SF_IMMUTABLE | SF_NOUNLINK)) {
-		printf("Invalid flags 0x%X for journal inode %d\n",
-		    DIP(ip, di_flags), sujino);
+		printf("Invalid flags 0x%X for journal inode %ju\n",
+		    DIP(ip, di_flags), (uintmax_t)sujino);
 		return (-1);
 	}
 
 	if (DIP(ip, di_mode) != (IFREG | IREAD)) {
-		printf("Invalid mode %o for journal inode %d\n",
-		    DIP(ip, di_mode), sujino);
+		printf("Invalid mode %o for journal inode %ju\n",
+		    DIP(ip, di_mode), (uintmax_t)sujino);
 		return (-1);
 	}
 
 	if (DIP(ip, di_size) < SUJ_MIN || DIP(ip, di_size) > SUJ_MAX) {
-		printf("Invalid size %jd for journal inode %d\n",
-		    DIP(ip, di_size), sujino);
+		printf("Invalid size %jd for journal inode %ju\n",
+		    DIP(ip, di_size), (uintmax_t)sujino);
 		return (-1);
 	}
 
@@ -2718,12 +2724,12 @@
 	 * Build a list of journal blocks in jblocks before parsing the
 	 * available journal blocks in with suj_read().
 	 */
-	printf("** Reading %jd byte journal from inode %d.\n",
-	    DIP(jip, di_size), sujino);
+	printf("** Reading %jd byte journal from inode %ju.\n",
+	    DIP(jip, di_size), (uintmax_t)sujino);
 	suj_jblocks = jblocks_create();
 	blocks = ino_visit(jip, sujino, suj_add_block, 0);
 	if (blocks != numfrags(fs, DIP(jip, di_size))) {
-		printf("Sparse journal inode %d.\n", sujino);
+		printf("Sparse journal inode %ju.\n", (uintmax_t)sujino);
 		return (-1);
 	}
 	suj_read();

Modified: soc2011/gk/ino64-head/sbin/fsdb/fsdb.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsdb/fsdb.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsdb/fsdb.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -34,6 +34,7 @@
 #endif /* not lint */
 
 #include <sys/param.h>
+#include <sys/stdint.h>
 #include <ctype.h>
 #include <err.h>
 #include <grp.h>
@@ -211,7 +212,8 @@
 prompt(EditLine *el)
 {
     static char pstring[64];
-    snprintf(pstring, sizeof(pstring), "fsdb (inum: %d)> ", curinum);
+    snprintf(pstring, sizeof(pstring), "fsdb (inum: %ju)> ",
+	(uintmax_t)curinum);
     return pstring;
 }
 
@@ -298,8 +300,8 @@
 
 #define GETINUM(ac,inum)    inum = strtoul(argv[ac], &cp, 0); \
     if (inum < ROOTINO || inum > maxino || cp == argv[ac] || *cp != '\0' ) { \
-	printf("inode %d out of range; range is [%d,%d]\n", \
-	       inum, ROOTINO, maxino); \
+	printf("inode %ju out of range; range is [%ju,%ju]\n", \
+	       (uintmax_t)inum, (uintmax_t)ROOTINO, (uintmax_t)maxino); \
 	return 1; \
     }
 
@@ -364,7 +366,8 @@
     if (!checkactive())
 	return 1;
     DIP_SET(curinode, di_nlink, DIP(curinode, di_nlink) + 1);
-    printf("inode %d link count now %d\n", curinum, DIP(curinode, di_nlink));
+    printf("inode %ju link count now %d\n",
+	(uintmax_t)curinum, DIP(curinode, di_nlink));
     inodirty();
     return 0;
 }
@@ -374,7 +377,8 @@
     if (!checkactive())
 	return 1;
     DIP_SET(curinode, di_nlink, DIP(curinode, di_nlink) - 1);
-    printf("inode %d link count now %d\n", curinum, DIP(curinode, di_nlink));
+    printf("inode %ju link count now %d\n",
+	(uintmax_t)curinum, DIP(curinode, di_nlink));
     inodirty();
     return 0;
 }
@@ -493,11 +497,11 @@
 	    if (is_ufs2 ?
 		compare_blk64(wantedblk64, ino_to_fsba(&sblock, inum)) :
 		compare_blk32(wantedblk32, ino_to_fsba(&sblock, inum))) {
-		printf("block %llu: inode block (%d-%d)\n",
+		printf("block %llu: inode block (%ju-%ju)\n",
 		    (unsigned long long)fsbtodb(&sblock,
 			ino_to_fsba(&sblock, inum)),
-		    (inum / INOPB(&sblock)) * INOPB(&sblock),
-		    (inum / INOPB(&sblock) + 1) * INOPB(&sblock));
+		    (uintmax_t)(inum / INOPB(&sblock)) * INOPB(&sblock),
+		    (uintmax_t)(inum / INOPB(&sblock) + 1) * INOPB(&sblock));
 		findblk_numtofind--;
 		if (findblk_numtofind == 0)
 		    goto end;
@@ -593,8 +597,8 @@
 founddatablk(uint64_t blk)
 {
 
-    printf("%llu: data block of inode %d\n",
-	(unsigned long long)fsbtodb(&sblock, blk), curinum);
+    printf("%llu: data block of inode %ju\n",
+	(unsigned long long)fsbtodb(&sblock, blk), (uintmax_t)curinum);
     findblk_numtofind--;
     if (findblk_numtofind == 0)
 	return 1;
@@ -753,7 +757,7 @@
 	return 1;
     rval = makeentry(curinum, inum, argv[2]);
     if (rval)
-	printf("Ino %d entered as `%s'\n", inum, argv[2]);
+	printf("Ino %ju entered as `%s'\n", (uintmax_t)inum, argv[2]);
     else
 	printf("could not enter name? weird.\n");
     curinode = ginode(curinum);

Modified: soc2011/gk/ino64-head/sbin/fsdb/fsdbutil.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsdb/fsdbutil.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsdb/fsdbutil.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -154,7 +154,7 @@
 	puts("fifo");
 	break;
     }
-    printf("I=%lu MODE=%o SIZE=%ju", (u_long)inum, DIP(dp, di_mode),
+    printf("I=%ju MODE=%o SIZE=%ju", (uintmax_t)inum, DIP(dp, di_mode),
 	(uintmax_t)DIP(dp, di_size));
     if (sblock.fs_magic != FS_UFS1_MAGIC) {
 	t = _time64_to_time(dp->dp2.di_birthtime);
@@ -292,7 +292,7 @@
     long ndb, offset;
     ufs2_daddr_t blkno;
 
-    printf("Blocks for inode %d:\n", inum);
+    printf("Blocks for inode %ju:\n", (uintmax_t)inum);
     printf("Direct blocks:\n");
     ndb = howmany(DIP(dp, di_size), sblock.fs_bsize);
     for (i = 0; i < NDADDR; i++) {
@@ -341,7 +341,7 @@
 	return 0;
     }
     if ((DIP(curinode, di_mode) & IFMT) != IFDIR) {
-	warnx("inode %d not a directory", curinum);
+	warnx("inode %ju not a directory", (uintmax_t)curinum);
 	return 0;
     }
     return 1;
@@ -366,11 +366,12 @@
 	    printstat("current inode", curinum, curinode);
 	break;
     case 0:
-	printf("current inode %d: unallocated inode\n", curinum);
+	printf("current inode %ju: unallocated inode\n", (uintmax_t)curinum);
 	break;
     default:
-	printf("current inode %d: screwy itype 0%o (mode 0%o)?\n",
-	       curinum, DIP(curinode, di_mode) & IFMT, DIP(curinode, di_mode));
+	printf("current inode %ju: screwy itype 0%o (mode 0%o)?\n",
+	       (uintmax_t)curinum, DIP(curinode, di_mode) & IFMT,
+	       DIP(curinode, di_mode));
 	break;
     }
     return 0;

Modified: soc2011/gk/ino64-head/sbin/fsirand/fsirand.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/fsirand/fsirand.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/fsirand/fsirand.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -275,8 +275,8 @@
 				dp2 = &((struct ufs2_dinode *)inodebuf)[n];
 			if (inumber >= ROOTINO) {
 				if (printonly)
-					(void)printf("ino %d gen %08x\n",
-					    inumber,
+					(void)printf("ino %ju gen %08x\n",
+					    (uintmax_t)inumber,
 					    sblock->fs_magic == FS_UFS1_MAGIC ?
 					    dp1->di_gen : dp2->di_gen);
 				else if (sblock->fs_magic == FS_UFS1_MAGIC) 

Modified: soc2011/gk/ino64-head/sbin/growfs/growfs.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/growfs/growfs.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/growfs/growfs.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -441,7 +441,7 @@
 	}
 	acg.cg_cs.cs_nifree += sblock.fs_ipg;
 	if (cylno == 0)
-		for (i = 0; i < ROOTINO; i++) {
+		for (i = 0; i < (ufs2_daddr_t)ROOTINO; i++) {
 			setbit(cg_inosused(&acg), i);
 			acg.cg_cs.cs_nifree--;
 		}
@@ -1868,7 +1868,7 @@
 		return NULL;
 	}
 	if (inumber > maxino)
-		errx(8, "bad inode number %d to ginode", inumber);
+		errx(8, "bad inode number %ju to ginode", (uintmax_t)inumber);
 	if (startinum == 0 ||
 	    inumber < startinum || inumber >= startinum + INOPB(&sblock)) {
 		inoblk = fsbtodb(&sblock, ino_to_fsba(&sblock, inumber));

Modified: soc2011/gk/ino64-head/sbin/newfs/mkfs.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/newfs/mkfs.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/newfs/mkfs.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -1005,7 +1005,8 @@
 	sblock.fs_cstotal.cs_nifree--;
 	fscs[0].cs_nifree--;
 	if (ino >= (unsigned long)sblock.fs_ipg * sblock.fs_ncg) {
-		printf("fsinit: inode value out of range (%d).\n", ino);
+		printf("fsinit: inode value out of range (%ju).\n",
+		    (uintmax_t)ino);
 		exit(32);
 	}
 	d = fsbtodb(&sblock, ino_to_fsba(&sblock, ino));

Modified: soc2011/gk/ino64-head/sbin/quotacheck/quotacheck.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/quotacheck/quotacheck.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/quotacheck/quotacheck.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -51,6 +51,7 @@
 #include <sys/disklabel.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
+#include <sys/stdint.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/quota.h>
@@ -383,9 +384,9 @@
 				if (vflag) {
 					if (aflag)
 						(void)printf("%s: ", mntpt);
-			(void)printf("out of range UID/GID (%u/%u) ino=%u\n",
+			(void)printf("out of range UID/GID (%u/%u) ino=%ju\n",
 					    DIP(dp, di_uid), DIP(dp,di_gid),
-					    ino);
+					    (uintmax_t)ino);
 				}
 				continue;
 			}
@@ -601,7 +602,8 @@
 	static caddr_t nextinop;
 
 	if (inumber != nextino++ || inumber > lastvalidinum)
-		errx(1, "bad inode number %d to nextinode", inumber);
+		errx(1, "bad inode number %ju to nextinode",
+		    (uintmax_t)inumber);
 	if (inumber >= lastinum) {
 		readcnt++;
 		dblk = fsbtodb(&sblock, ino_to_fsba(&sblock, lastinum));
@@ -635,7 +637,7 @@
 {
 
 	if (inum % sblock.fs_ipg != 0)
-		errx(1, "bad inode number %d to setinodebuf", inum);
+		errx(1, "bad inode number %ju to setinodebuf", (uintmax_t)inum);
 	lastvalidinum = inum + sblock.fs_ipg - 1;
 	nextino = inum;
 	lastinum = inum;

Modified: soc2011/gk/ino64-head/sbin/restore/dirs.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/restore/dirs.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/restore/dirs.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -637,7 +637,8 @@
 				continue;
 		}
 		if (ep == NULL) {
-			panic("cannot find directory inode %d\n", node.ino);
+			panic("cannot find directory inode %ju\n",
+			    (uintmax_t)node.ino);
 			continue;
 		}
 		cp = myname(ep);
@@ -678,7 +679,8 @@
 
 	itp = inotablookup(ino);
 	if (itp == NULL)
-		panic("Cannot find directory inode %d named %s\n", ino, name);
+		panic("Cannot find directory inode %ju named %s\n",
+		    (uintmax_t)ino, name);
 	if ((ofile = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) {
 		fprintf(stderr, "%s: ", name);
 		(void) fflush(stderr);
@@ -691,15 +693,15 @@
 		size = i < BUFSIZ ? i : BUFSIZ;
 		if (read(dp, buf, (int) size) == -1) {
 			fprintf(stderr,
-				"write error extracting inode %d, name %s\n",
-				curfile.ino, curfile.name);
+				"write error extracting inode %ju, name %s\n",
+				(uintmax_t)curfile.ino, curfile.name);
 			fprintf(stderr, "read: %s\n", strerror(errno));
 			done(1);
 		}
 		if (!Nflag && write(ofile, buf, (int) size) == -1) {
 			fprintf(stderr,
-				"write error extracting inode %d, name %s\n",
-				curfile.ino, curfile.name);
+				"write error extracting inode %ju, name %s\n",
+				(uintmax_t)curfile.ino, curfile.name);
 			fprintf(stderr, "write: %s\n", strerror(errno));
 			done(1);
 		}

Modified: soc2011/gk/ino64-head/sbin/restore/interactive.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/restore/interactive.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/restore/interactive.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -38,6 +38,7 @@
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/stdint.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
@@ -675,7 +676,8 @@
 		for (j = 0; j < columns; j++) {
 			fp = &list[j * lines + i];
 			if (vflag) {
-				fprintf(stderr, "%*d ", precision, fp->fnum);
+				fprintf(stderr, "%*jd ",
+				    precision, (uintmax_t)fp->fnum);
 				fp->len += precision + 1;
 			}
 			if (haveprefix) {

Modified: soc2011/gk/ino64-head/sbin/restore/restore.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/restore/restore.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/restore/restore.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -37,6 +37,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#include <sys/stdint.h>
 
 #include <limits.h>
 #include <stdio.h>
@@ -61,7 +62,7 @@
 	if (TSTINO(ino, dumpmap) == 0)
 		return (descend);
 	vprintf(stdout, "%s", type == LEAF ? "leaf" : "dir ");
-	fprintf(stdout, "%10d\t%s\n", ino, name);
+	fprintf(stdout, "%10ju\t%s\n", (uintmax_t)ino, name);
 	return (descend);
 }
 
@@ -83,7 +84,7 @@
 	if (ino == WINO && command == 'i' && !vflag)
 		return (descend);
 	if (!mflag) {
-		(void) sprintf(buf, "./%u", ino);
+		(void) sprintf(buf, "./%ju", (uintmax_t)ino);
 		name = buf;
 		if (type == NODE) {
 			(void) genliteraldir(name, ino);
@@ -457,8 +458,8 @@
 	 * next incremental tape.
 	 */
 	case 0:
-		fprintf(stderr, "%s: (inode %d) not found on tape\n",
-			name, ino);
+		fprintf(stderr, "%s: (inode %ju) not found on tape\n",
+			name, (uintmax_t)ino);
 		break;
 
 	/*
@@ -612,7 +613,7 @@
 		while (first < curfile.ino) {
 			ep = lookupino(first);
 			if (ep == NULL)
-				panic("%d: bad first\n", first);
+				panic("%ju: bad first\n", (uintmax_t)first);
 			fprintf(stderr, "%s: not found on tape\n", myname(ep));
 			ep->e_flags &= ~(NEW|EXTRACT);
 			first = lowerbnd(first);
@@ -625,8 +626,8 @@
 		 * on the next incremental tape.
 		 */
 		if (first != curfile.ino) {
-			fprintf(stderr, "expected next file %d, got %d\n",
-				first, curfile.ino);
+			fprintf(stderr, "expected next file %ju, got %ju\n",
+				(uintmax_t)first, (uintmax_t)curfile.ino);
 			skipfile();
 			goto next;
 		}
@@ -852,7 +853,7 @@
 		if (np == ep)
 			break;
 	if (np == NULL)
-		panic("missing inumber %d\n", ino);
+		panic("missing inumber %ju\n", (uintmax_t)ino);
 	if (ep->e_type == LEAF && type != LEAF)
 		badentry(ep, "type should be LEAF");
 	return (descend);

Modified: soc2011/gk/ino64-head/sbin/restore/symtab.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/restore/symtab.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/restore/symtab.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -46,6 +46,7 @@
 
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/stdint.h>
 
 #include <ufs/ufs/dinode.h>
 
@@ -100,7 +101,7 @@
 	struct entry **epp;
 
 	if (inum < WINO || inum >= maxino)
-		panic("addino: out of range %d\n", inum);
+		panic("addino: out of range %ju\n", (uintmax_t)inum);
 	epp = &entry[inum % entrytblsize];
 	np->e_ino = inum;
 	np->e_next = *epp;
@@ -121,7 +122,7 @@
 	struct entry **prev;
 
 	if (inum < WINO || inum >= maxino)
-		panic("deleteino: out of range %d\n", inum);
+		panic("deleteino: out of range %ju\n", (uintmax_t)inum);
 	prev = &entry[inum % entrytblsize];
 	for (next = *prev; next != NULL; next = next->e_next) {
 		if (next->e_ino == inum) {
@@ -131,7 +132,7 @@
 		}
 		prev = &next->e_next;
 	}
-	panic("deleteino: %d not found\n", inum);
+	panic("deleteino: %ju not found\n", (uintmax_t)inum);
 }
 
 /*

Modified: soc2011/gk/ino64-head/sbin/restore/tape.c
==============================================================================
--- soc2011/gk/ino64-head/sbin/restore/tape.c	Sun Jun  5 16:20:38 2011	(r222840)
+++ soc2011/gk/ino64-head/sbin/restore/tape.c	Sun Jun  5 16:21:16 2011	(r222841)
@@ -274,7 +274,7 @@
 		done(1);
 	}
 	maxino = (spcl.c_count * TP_BSIZE * NBBY) + 1;
-	dprintf(stdout, "maxino = %d\n", maxino);
+	dprintf(stdout, "maxino = %ju\n", (uintmax_t)maxino);
 	map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
 	if (map == NULL)
 		panic("no memory for active inode map\n");
@@ -1050,8 +1050,9 @@
 	}
 	extbufsize = 0;
 	extbuf = NULL;
-	fprintf(stderr, "Cannot extract %d bytes %s for inode %d, name %s\n",
-	    extsize, "of extended attributes", curfile.ino, curfile.name);
+	fprintf(stderr, "Cannot extract %d bytes %s for inode %ju, name %s\n",
+	    extsize, "of extended attributes", (uintmax_t)curfile.ino,
+	    curfile.name);
 	return (NULL);
 }
 
@@ -1079,8 +1080,8 @@
 		return;
 	if (write(ofile, buf, (int) size) == -1) {
 		fprintf(stderr,
-		    "write error extracting inode %d, name %s\nwrite: %s\n",
-			curfile.ino, curfile.name, strerror(errno));
+		    "write error extracting inode %ju, name %s\nwrite: %s\n",
+			(uintmax_t)curfile.ino, curfile.name, strerror(errno));
 	}
 }
 
@@ -1094,8 +1095,8 @@
 
 	if (lseek(ofile, size, SEEK_CUR) == -1) {

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:21:29 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id E0EF51065686
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:21:26 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:21:26 +0000
Date: Sun, 05 Jun 2011 16:21:26 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162126.E0EF51065686@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222842 - soc2011/gk/ino64-head/include/protocols
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:21:29 -0000

Author: gk
Date: Sun Jun  5 16:21:26 2011
New Revision: 222842
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222842

Log:
  Don't use ino_t in dumprestore protocol definition

Modified:
  soc2011/gk/ino64-head/include/protocols/dumprestore.h

Modified: soc2011/gk/ino64-head/include/protocols/dumprestore.h
==============================================================================
--- soc2011/gk/ino64-head/include/protocols/dumprestore.h	Sun Jun  5 16:21:16 2011	(r222841)
+++ soc2011/gk/ino64-head/include/protocols/dumprestore.h	Sun Jun  5 16:21:26 2011	(r222842)
@@ -73,7 +73,7 @@
 		int32_t	c_old_ddate;	    /* date of previous dump */
 		int32_t	c_volume;	    /* dump volume number */
 		int32_t	c_old_tapea;	    /* logical block of this record */
-		ino_t	c_inumber;	    /* number of inode */
+		uint32_t c_inumber;	    /* number of inode */
 		int32_t	c_magic;	    /* magic number (see above) */
 		int32_t	c_checksum;	    /* record checksum */
 		/*

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:21:40 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id A706A106566C
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:21:38 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:21:38 +0000
Date: Sun, 05 Jun 2011 16:21:38 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162138.A706A106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222843 - in soc2011/gk/ino64-head/sys/fs: hpfs ntfs
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:21:40 -0000

Author: gk
Date: Sun Jun  5 16:21:38 2011
New Revision: 222843
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222843

Log:
  Use C99-style struct initialization for dirent

Modified:
  soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vnops.c
  soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c

Modified: soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vnops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vnops.c	Sun Jun  5 16:21:26 2011	(r222842)
+++ soc2011/gk/ino64-head/sys/fs/hpfs/hpfs_vnops.c	Sun Jun  5 16:21:38 2011	(r222843)
@@ -797,10 +797,20 @@
 }
 
 
-static struct dirent hpfs_de_dot =
-	{ 0, sizeof(struct dirent), DT_DIR, 1, "." };
-static struct dirent hpfs_de_dotdot =
-	{ 0, sizeof(struct dirent), DT_DIR, 2, ".." };
+static struct dirent hpfs_de_dot = {
+	.d_fileno = 0,
+	.d_reclen = sizeof(struct dirent),
+	.d_type = DT_DIR,
+	.d_namlen = 1,
+	.d_name = "."
+};
+static struct dirent hpfs_de_dotdot = {
+	.d_fileno = 0,
+	.d_reclen = sizeof(struct dirent),
+	.d_type = DT_DIR,
+	.d_namlen = 2,
+	.d_name = ".."
+};
 int
 hpfs_readdir(ap)
 	struct vop_readdir_args /* {

Modified: soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c
==============================================================================
--- soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c	Sun Jun  5 16:21:26 2011	(r222842)
+++ soc2011/gk/ino64-head/sys/fs/ntfs/ntfs_vnops.c	Sun Jun  5 16:21:38 2011	(r222843)
@@ -500,8 +500,13 @@
 
 	/* Simulate . in every dir except ROOT */
 	if( ip->i_number != NTFS_ROOTINO ) {
-		struct dirent dot = { NTFS_ROOTINO,
-				sizeof(struct dirent), DT_DIR, 1, "." };
+		struct dirent dot = {
+			.d_fileno = NTFS_ROOTINO,
+			.d_reclen = sizeof(struct dirent),
+			.d_type = DT_DIR,
+			.d_namlen = 1,
+			.d_name = "."
+		};
 
 		if( uio->uio_offset < sizeof(struct dirent) ) {
 			dot.d_fileno = ip->i_number;
@@ -515,8 +520,13 @@
 
 	/* Simulate .. in every dir including ROOT */
 	if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
-		struct dirent dotdot = { NTFS_ROOTINO,
-				sizeof(struct dirent), DT_DIR, 2, ".." };
+		struct dirent dotdot = {
+			.d_fileno = NTFS_ROOTINO,
+			.d_reclen = sizeof(struct dirent),
+			.d_type = DT_DIR,
+			.d_namlen = 2,
+			.d_name = ".."
+		};
 
 		error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
 		if(error)

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:21:51 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id C74AD106564A
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:21:49 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:21:49 +0000
Date: Sun, 05 Jun 2011 16:21:49 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162149.C74AD106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222844 - in soc2011/gk/ino64-head/sys: kern sys
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:21:52 -0000

Author: gk
Date: Sun Jun  5 16:21:49 2011
New Revision: 222844
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222844

Log:
  Add kern_fhstat() wrapper, adjust fhstat() to use it

Modified:
  soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c
  soc2011/gk/ino64-head/sys/sys/syscallsubr.h

Modified: soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c	Sun Jun  5 16:21:38 2011	(r222843)
+++ soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c	Sun Jun  5 16:21:49 2011	(r222844)
@@ -4553,20 +4553,30 @@
  */
 #ifndef _SYS_SYSPROTO_H_
 struct fhstat_args {
-	struct fhandle *u_fhp;
+	const struct fhandle *u_fhp;
 	struct stat *sb;
 };
 #endif
 int
-fhstat(td, uap)
-	struct thread *td;
-	register struct fhstat_args /* {
-		struct fhandle *u_fhp;
-		struct stat *sb;
-	} */ *uap;
+fhstat(struct thread *td, struct fhstat_args *uap)
 {
 	struct stat sb;
-	fhandle_t fh;
+	struct fhandle fh;
+	int error;
+
+	error = copyin(uap->u_fhp, &fh, sizeof(fhandle_t));
+	if (error != 0)
+		return (error);
+	error = kern_fhstat(td, fh, &sb);
+	if (error != 0)
+		return (error);
+	error = copyout(&sb, uap->sb, sizeof(sb));
+	return (error);
+}
+
+int
+kern_fhstat(struct thread *td, struct fhandle fh, struct stat *sb)
+{
 	struct mount *mp;
 	struct vnode *vp;
 	int vfslocked;
@@ -4575,9 +4585,6 @@
 	error = priv_check(td, PRIV_VFS_FHSTAT);
 	if (error)
 		return (error);
-	error = copyin(uap->u_fhp, &fh, sizeof(fhandle_t));
-	if (error)
-		return (error);
 	if ((mp = vfs_busyfs(&fh.fh_fsid)) == NULL)
 		return (ESTALE);
 	vfslocked = VFS_LOCK_GIANT(mp);
@@ -4587,12 +4594,9 @@
 		VFS_UNLOCK_GIANT(vfslocked);
 		return (error);
 	}
-	error = vn_stat(vp, &sb, td->td_ucred, NOCRED, td);
+	error = vn_stat(vp, sb, td->td_ucred, NOCRED, td);
 	vput(vp);
 	VFS_UNLOCK_GIANT(vfslocked);
-	if (error)
-		return (error);
-	error = copyout(&sb, uap->sb, sizeof(sb));
 	return (error);
 }
 

Modified: soc2011/gk/ino64-head/sys/sys/syscallsubr.h
==============================================================================
--- soc2011/gk/ino64-head/sys/sys/syscallsubr.h	Sun Jun  5 16:21:38 2011	(r222843)
+++ soc2011/gk/ino64-head/sys/sys/syscallsubr.h	Sun Jun  5 16:21:49 2011	(r222844)
@@ -89,6 +89,7 @@
 int	kern_fchownat(struct thread *td, int fd, char *path,
 	    enum uio_seg pathseg, int uid, int gid, int flag);
 int	kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg);
+int	kern_fhstat(struct thread *td, fhandle_t fh, struct stat *buf);
 int	kern_fhstatfs(struct thread *td, fhandle_t fh, struct statfs *buf);
 int	kern_fstat(struct thread *td, int fd, struct stat *sbp);
 int	kern_fstatfs(struct thread *td, int fd, struct statfs *buf);

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:22:04 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 35A92106564A
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:22:02 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:22:02 +0000
Date: Sun, 05 Jun 2011 16:22:02 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162202.35A92106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222845 - in soc2011/gk/ino64-head/sys:
	compat/freebsd32 kern sys
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:22:04 -0000

Author: gk
Date: Sun Jun  5 16:22:01 2011
New Revision: 222845
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222845

Log:
  Extend kern_getdirentries to accept segflg and return buffer residue

Modified:
  soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_misc.c
  soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c
  soc2011/gk/ino64-head/sys/sys/syscallsubr.h

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_misc.c	Sun Jun  5 16:21:49 2011	(r222844)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_misc.c	Sun Jun  5 16:22:01 2011	(r222845)
@@ -1485,7 +1485,8 @@
 	int32_t base32;
 	int error;
 
-	error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base);
+	error = kern_getdirentries(td, uap->fd, uap->buf, uap->count,
+	    &base, NULL, UIO_USERSPACE);
 	if (error)
 		return (error);
 	if (uap->basep != NULL) {

Modified: soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c	Sun Jun  5 16:21:49 2011	(r222844)
+++ soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c	Sun Jun  5 16:22:01 2011	(r222845)
@@ -4062,7 +4062,8 @@
 	long base;
 	int error;
 
-	error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base);
+	error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base,
+	    NULL, UIO_USERSPACE);
 	if (error)
 		return (error);
 	if (uap->basep != NULL)
@@ -4072,7 +4073,7 @@
 
 int
 kern_getdirentries(struct thread *td, int fd, char *buf, u_int count,
-    long *basep)
+    long *basep, ssize_t *residp, enum uio_seg bufseg)
 {
 	struct vnode *vp;
 	struct file *fp;
@@ -4104,7 +4105,7 @@
 	auio.uio_iov = &aiov;
 	auio.uio_iovcnt = 1;
 	auio.uio_rw = UIO_READ;
-	auio.uio_segflg = UIO_USERSPACE;
+	auio.uio_segflg = bufseg;
 	auio.uio_td = td;
 	auio.uio_resid = count;
 	vn_lock(vp, LK_SHARED | LK_RETRY);
@@ -4138,6 +4139,8 @@
 	VOP_UNLOCK(vp, 0);
 	VFS_UNLOCK_GIANT(vfslocked);
 	*basep = loff;
+	if (residp != NULL)
+		*residp = auio.uio_resid;
 	td->td_retval[0] = count - auio.uio_resid;
 fail:
 	fdrop(fp, td);

Modified: soc2011/gk/ino64-head/sys/sys/syscallsubr.h
==============================================================================
--- soc2011/gk/ino64-head/sys/sys/syscallsubr.h	Sun Jun  5 16:21:49 2011	(r222844)
+++ soc2011/gk/ino64-head/sys/sys/syscallsubr.h	Sun Jun  5 16:22:01 2011	(r222845)
@@ -97,7 +97,7 @@
 int	kern_futimes(struct thread *td, int fd, struct timeval *tptr,
 	    enum uio_seg tptrseg);
 int	kern_getdirentries(struct thread *td, int fd, char *buf, u_int count,
-	    long *basep);
+	    long *basep, ssize_t *residp, enum uio_seg bufseg);
 int	kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize,
 	    enum uio_seg bufseg, int flags);
 int	kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups);

From owner-svn-soc-all@FreeBSD.ORG  Sun Jun  5 16:22:14 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 8C64E1065673
	for <svn-soc-all@FreeBSD.org>; Sun,  5 Jun 2011 16:22:12 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 05 Jun 2011 16:22:12 +0000
Date: Sun, 05 Jun 2011 16:22:12 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110605162212.8C64E1065673@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222846 -
	soc2011/gk/ino64-head/tools/tools/shlib-compat
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2011 16:22:14 -0000

Author: gk
Date: Sun Jun  5 16:22:12 2011
New Revision: 222846
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222846

Log:
  shlib-compat: add --alias-prefix option
  
  Merge rev 80347e403bf6ed616a8d

Modified:
  soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat

Modified: soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat
==============================================================================
--- soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat	Sun Jun  5 16:22:01 2011	(r222845)
+++ soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat	Sun Jun  5 16:22:12 2011	(r222846)
@@ -34,8 +34,10 @@
     # controlled by user
     verbose = 0
     dump = False
+    no_dump = False
     version_filter = None
     symbol_filter = None
+    alias_prefix = None
     # misc opts
     objdump = 'objdump'
     dwarfdump = 'dwarfdump'
@@ -58,6 +60,9 @@
         cls.version_filter = StrFilter()
         cls.symbol_filter = StrFilter()
 
+class App(object):
+    result_code = 0
+
 # {{{ misc
 
 class StrFilter(object):
@@ -187,6 +192,17 @@
     def __repr__(self):
         return "CommonSymbol(%s, %s)" % (self.name, self.version)
 
+class SymbolAlias(object):
+    def __init__(self, alias, offset):
+        assert alias.startswith(Config.alias_prefix)
+        self.alias = alias
+        self.name = alias[len(Config.alias_prefix):]
+        self.offset = offset
+
+    def __repr__(self):
+        return "SymbolAlias(%s, 0x%x)" % (self.alias, self.offset)
+
+
 class VersionMap(object):
     def __init__(self, name):
         self.name = name
@@ -252,8 +268,9 @@
             if ind != 0:
                 Dwarf.cmpcache.put(ind, r)
         else:
-            raise RuntimeError('Comparing different classes: %s, %s' %
-                    (a.__class__.__name__, b.__class__.__name__))
+            r = 0
+            #raise RuntimeError('Comparing different classes: %s, %s' %
+            #        (a.__class__.__name__, b.__class__.__name__))
         return r
 
     def __repr__(self):
@@ -569,6 +586,7 @@
     def __init__(self, libfile):
         self.libfile = libfile
         self.versions = {}
+        self.alias_syms = {}
 
     def parse_objdump(self):
         objdump = ObjdumpParser(self.libfile)
@@ -585,16 +603,41 @@
             if not self.versions.has_key(vername):
                 self.versions[vername] = VersionMap(vername)
             self.versions[vername].append(sym)
+        if Config.alias_prefix:
+            self.local_offsetmap = objdump.local_offsetmap
+            for p in objdump.local_symbols:
+                if p['symbol'].startswith(Config.alias_prefix):
+                    alias = SymbolAlias(p['symbol'], p['offset'])
+                    if self.alias_syms.has_key(alias.name):
+                        print >> sys.stderr, "WARN: Symbol alias is already defined: %s/%s" % \
+                                (self.name, self.alias)
+                    self.alias_syms[alias.name] = alias
 
     def parse_dwarfdump(self):
         dwarfdump = DwarfdumpParser(self.libfile)
+        def lookup(sym):
+            raw = None
+            try:
+                raw = dwarfdump.offsetmap[sym.offset]
+            except:
+                try:
+                    localnames = self.local_offsetmap[sym.offset]
+                    localnames.sort(key=lambda x: -len(x))
+                    for localname in localnames:
+                        if not self.alias_syms.has_key(localname):
+                            continue
+                        alias = self.alias_syms[localname]
+                        raw = dwarfdump.offsetmap[alias.offset]
+                        break
+                except:
+                    pass
+            return raw
         dwarfdump.run()
         dwarf = Dwarf(dwarfdump)
         for ver in self.versions.values():
             for sym in ver.symbols.values():
-                try:
-                    raw = dwarfdump.offsetmap[sym.offset]
-                except:
+                raw = lookup(sym);
+                if not raw:
                     print >> sys.stderr, "WARN: Symbol %s (%s) not found at offset 0x%x" % \
                             (sym.name_ver, self.libfile, sym.offset)
                     continue
@@ -636,19 +679,25 @@
     re_dynamic_symbol = re.compile('(?P<offset>[0-9a-fA-F]+)\s+(?P<bind>\w+)\s+(?P<type>\w+)\s+(?P<section>[^\s]+)\s+(?P<foffset>[0-9a-fA-F]+)\s*(?P<ver>[^\s]*)\s*(?P<symbol>[^\s]*)')
 
     def __init__(self, libfile):
-        Parser.__init__(self, "%s -wT %s" % (Config.objdump, libfile))
+        Parser.__init__(self, "%s -wtT %s" % (Config.objdump, libfile))
         self.dynamic_symbols = []
         self.local_symbols = []
+        self.local_offsetmap = {}
 
     def parse_begin(self, line):
         self.parse_header(line)
 
-    def add_symbol(self, table, symbol):
+    def add_symbol(self, table, symbol, offsetmap = None):
         offset = int(symbol['offset'], 16);
         symbol['offset'] = offset
         if (offset == 0):
             return
         table.append(symbol)
+        if offsetmap != None:
+            if not offsetmap.has_key(offset):
+                offsetmap[offset] = [symbol['symbol']]
+            else:
+                offsetmap[offset].append(symbol['symbol'])
 
     def parse_header(self, line):
         m = self.re_header.match(line)
@@ -670,10 +719,11 @@
             return
         m = self.re_local_symbol.match(line)
         if (not m):
-            raise ValueError("Invalid symbol definition: %s" % line)
+            return
+            #raise ValueError("Invalid symbol definition: %s" % line)
         p = m.groupdict()
         if (p['symbol'] and p['symbol'].find('@') == -1):
-            self.add_symbol(self.local_symbols, p);
+            self.add_symbol(self.local_symbols, p, self.local_offsetmap);
 
     def parse_dynamic(self, line):
         if (self.parse_header(line)):
@@ -843,20 +893,29 @@
         print 'Removed version:     ', vername
         print '    Removed symbols: ', \
                 names_ver_str(vername, origlib.versions[vername].names())
+    added = []
+    removed = []
     for vername in verdiff.common:
         origver = origlib.versions[vername]
         newver = newlib.versions[vername]
         namediff = ListDiff(origver.names(), newver.names())
-        if namediff.added or namediff.removed:
-            print 'Added symbols:    ', \
-                    names_ver_str(vername, namediff.added)
-            print 'Removed symbols:  ', \
-                    names_ver_str(vername, namediff.removed)
+        if namediff.added:
+            added.append(names_ver_str(vername, namediff.added))
+        if namediff.removed:
+            removed.append(names_ver_str(vername, namediff.removed))
         commonver = VersionMap(vername)
         result.append(commonver)
         for n in namediff.common:
             sym = CommonSymbol(origver.symbols[n], newver.symbols[n])
             commonver.append(sym)
+    if added:
+        print 'Added symbols:'
+        for i in added:
+            print '    ', i
+    if removed:
+        print 'Removed symbols:'
+        for i in removed:
+            print '    ', i
     return result
 
 def cmp_symbols(commonver):
@@ -866,14 +925,20 @@
         for symname in names:
             sym = ver.symbols[symname]
             match = sym.origsym.definition == sym.newsym.definition
+            if not match:
+                App.result_code = 1
             if Config.verbose >= 1 or not match:
                 print '%s: definitions %smatch' % \
                         (sym.origsym.name_ver, "" if match else "mis")
-                if Config.dump and not match:
+                if Config.dump or (not match and not Config.no_dump):
                     for x in [(sym.origsym, Config.origfile),
                             (sym.newsym, Config.newfile)]:
                         xsym = x[0]
                         xout = x[1].out
+                        if not xsym.definition:
+                            print >> xout, '\n// Definition not found: %s %s' % \
+                                    (xsym.name_ver, xsym.lib.libfile)
+                            continue
                         print >> xout, '\n// Definitions mismatch: %s %s' % \
                                 (xsym.name_ver, xsym.lib.libfile)
                         pp = PrettyPrinter()
@@ -921,8 +986,12 @@
             version="%prog " + Config.version)
     parser.add_option('-v', '--verbose', action='count',
             help="verbose mode, may be specified several times")
+    parser.add_option('--alias-prefix', action='store',
+            help="name prefix to try for symbol alias lookup", metavar="STR")
     parser.add_option('--dump', action='store_true',
             help="dump symbol definitions")
+    parser.add_option('--no-dump', action='store_true',
+            help="disable dump for mismatched symbols")
     parser.add_option('--out-orig', action='store',
             help="result output file for original library", metavar="ORIGFILE")
     parser.add_option('--out-new', action='store',
@@ -940,11 +1009,17 @@
         Config.origfile.init(opts.out_orig)
     if opts.out_new:
         Config.newfile.init(opts.out_new)
+    if opts.no_dump:
+        Config.dump = False
+        Config.no_dump = True
     if opts.dump:
         Config.dump = True
+        Config.no_dump = False
         Config.verbose = 1
     if opts.verbose:
         Config.verbose = opts.verbose
+    if opts.alias_prefix:
+        Config.alias_prefix = opts.alias_prefix
     for (k, v) in ({ '_sym': Config.symbol_filter,
             '_ver': Config.version_filter }).items():
         for a in [ 'exclude', 'include' ]:
@@ -969,3 +1044,4 @@
         print Dwarf.cmpcache.stats.show('Cmp')
         print DwarfdumpParser.tagcache_stats.show('Dwarf tag')
 
+    sys.exit(App.result_code)

From owner-svn-soc-all@FreeBSD.ORG  Mon Jun  6 16:40:57 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 319EE106564A
	for <svn-soc-all@FreeBSD.org>; Mon,  6 Jun 2011 16:40:56 +0000 (UTC)
	(envelope-from kulakov_ad@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Mon, 06 Jun 2011 16:40:56 +0000
Date: Mon, 06 Jun 2011 16:40:56 +0000
From: kulakov_ad@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110606164056.319EE106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222890 - soc2011/kulakov_ad
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2011 16:40:57 -0000

Author: kulakov_ad
Date: Mon Jun  6 16:40:55 2011
New Revision: 222890
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222890

Log:

Added:
  soc2011/kulakov_ad/

From owner-svn-soc-all@FreeBSD.ORG  Mon Jun  6 17:10:45 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 298A6106567A
	for <svn-soc-all@FreeBSD.org>; Mon,  6 Jun 2011 17:10:42 +0000 (UTC)
	(envelope-from kulakov_ad@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Mon, 06 Jun 2011 17:10:42 +0000
Date: Mon, 06 Jun 2011 17:10:42 +0000
From: kulakov_ad@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110606171042.298A6106567A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r222895 - in soc2011/kulakov_ad: . build-aux
	callouts callouts/tests cli cli/src data docs docs/api
	docs/api/html docs/api/tmpl docs/libnm-glib
	docs/libnm-glib/html docs/libnm-glib/t...
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2011 17:10:45 -0000

Author: kulakov_ad
Date: Mon Jun  6 17:10:41 2011
New Revision: 222895
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=222895

Log:

Added:
  soc2011/kulakov_ad/ABOUT-NLS
  soc2011/kulakov_ad/AUTHORS
  soc2011/kulakov_ad/CONTRIBUTING
  soc2011/kulakov_ad/COPYING
  soc2011/kulakov_ad/ChangeLog
  soc2011/kulakov_ad/INSTALL
  soc2011/kulakov_ad/Makefile.am
  soc2011/kulakov_ad/Makefile.in
  soc2011/kulakov_ad/NEWS
  soc2011/kulakov_ad/NetworkManager.pc.in
  soc2011/kulakov_ad/README
  soc2011/kulakov_ad/TODO
  soc2011/kulakov_ad/aclocal.m4
  soc2011/kulakov_ad/build-aux/
  soc2011/kulakov_ad/build-aux/compile   (contents, props changed)
  soc2011/kulakov_ad/build-aux/config.guess   (contents, props changed)
  soc2011/kulakov_ad/build-aux/config.rpath   (contents, props changed)
  soc2011/kulakov_ad/build-aux/config.sub   (contents, props changed)
  soc2011/kulakov_ad/build-aux/depcomp   (contents, props changed)
  soc2011/kulakov_ad/build-aux/install-sh   (contents, props changed)
  soc2011/kulakov_ad/build-aux/ltmain.sh   (contents, props changed)
  soc2011/kulakov_ad/build-aux/missing   (contents, props changed)
  soc2011/kulakov_ad/callouts/
  soc2011/kulakov_ad/callouts/77-nm-olpc-mesh.rules
  soc2011/kulakov_ad/callouts/Makefile.am
  soc2011/kulakov_ad/callouts/Makefile.in
  soc2011/kulakov_ad/callouts/nm-avahi-autoipd-action.c
  soc2011/kulakov_ad/callouts/nm-avahi-autoipd.conf
  soc2011/kulakov_ad/callouts/nm-dhcp-client-action.c
  soc2011/kulakov_ad/callouts/nm-dhcp-client.conf
  soc2011/kulakov_ad/callouts/nm-dispatcher-action.c
  soc2011/kulakov_ad/callouts/nm-dispatcher-action.h
  soc2011/kulakov_ad/callouts/nm-dispatcher-utils.c
  soc2011/kulakov_ad/callouts/nm-dispatcher-utils.h
  soc2011/kulakov_ad/callouts/nm-dispatcher.conf
  soc2011/kulakov_ad/callouts/nm-dispatcher.xml
  soc2011/kulakov_ad/callouts/org.freedesktop.nm_dispatcher.service.in
  soc2011/kulakov_ad/callouts/tests/
  soc2011/kulakov_ad/callouts/tests/Makefile.am
  soc2011/kulakov_ad/callouts/tests/Makefile.in
  soc2011/kulakov_ad/callouts/tests/dispatcher-old-down
  soc2011/kulakov_ad/callouts/tests/dispatcher-old-up
  soc2011/kulakov_ad/callouts/tests/dispatcher-old-vpn-down
  soc2011/kulakov_ad/callouts/tests/dispatcher-old-vpn-up
  soc2011/kulakov_ad/callouts/tests/test-dispatcher-envp.c
  soc2011/kulakov_ad/cli/
  soc2011/kulakov_ad/cli/Makefile.am
  soc2011/kulakov_ad/cli/Makefile.in
  soc2011/kulakov_ad/cli/src/
  soc2011/kulakov_ad/cli/src/Makefile.am
  soc2011/kulakov_ad/cli/src/Makefile.in
  soc2011/kulakov_ad/cli/src/connections.c
  soc2011/kulakov_ad/cli/src/connections.h
  soc2011/kulakov_ad/cli/src/devices.c
  soc2011/kulakov_ad/cli/src/devices.h
  soc2011/kulakov_ad/cli/src/network-manager.c
  soc2011/kulakov_ad/cli/src/network-manager.h
  soc2011/kulakov_ad/cli/src/nmcli.c
  soc2011/kulakov_ad/cli/src/nmcli.h
  soc2011/kulakov_ad/cli/src/settings.c
  soc2011/kulakov_ad/cli/src/settings.h
  soc2011/kulakov_ad/cli/src/utils.c
  soc2011/kulakov_ad/cli/src/utils.h
  soc2011/kulakov_ad/compile   (contents, props changed)
  soc2011/kulakov_ad/config.guess   (contents, props changed)
  soc2011/kulakov_ad/config.h.in
  soc2011/kulakov_ad/config.sub   (contents, props changed)
  soc2011/kulakov_ad/configure   (contents, props changed)
  soc2011/kulakov_ad/configure.ac
  soc2011/kulakov_ad/data/
  soc2011/kulakov_ad/data/Makefile.am
  soc2011/kulakov_ad/data/Makefile.in
  soc2011/kulakov_ad/data/NetworkManager-wait-online.service.in
  soc2011/kulakov_ad/data/NetworkManager.service.in
  soc2011/kulakov_ad/data/org.freedesktop.NetworkManager.service.in
  soc2011/kulakov_ad/depcomp   (contents, props changed)
  soc2011/kulakov_ad/docs/
  soc2011/kulakov_ad/docs/Makefile.am
  soc2011/kulakov_ad/docs/Makefile.in
  soc2011/kulakov_ad/docs/api/
  soc2011/kulakov_ad/docs/api/Makefile.am
  soc2011/kulakov_ad/docs/api/Makefile.in
  soc2011/kulakov_ad/docs/api/NetworkManager-overrides.txt
  soc2011/kulakov_ad/docs/api/NetworkManager-sections.txt
  soc2011/kulakov_ad/docs/api/generate-settings-spec.c
  soc2011/kulakov_ad/docs/api/html/
  soc2011/kulakov_ad/docs/api/html/NetworkManager.devhelp
  soc2011/kulakov_ad/docs/api/html/NetworkManager.devhelp2
  soc2011/kulakov_ad/docs/api/html/home.png   (contents, props changed)
  soc2011/kulakov_ad/docs/api/html/index.html
  soc2011/kulakov_ad/docs/api/html/ix01.html
  soc2011/kulakov_ad/docs/api/html/left.png   (contents, props changed)
  soc2011/kulakov_ad/docs/api/html/license.html
  soc2011/kulakov_ad/docs/api/html/ref-dbus.html
  soc2011/kulakov_ad/docs/api/html/ref-migrating.html
  soc2011/kulakov_ad/docs/api/html/ref-settings.html
  soc2011/kulakov_ad/docs/api/html/right.png   (contents, props changed)
  soc2011/kulakov_ad/docs/api/html/secrets-flags.html
  soc2011/kulakov_ad/docs/api/html/spec.html
  soc2011/kulakov_ad/docs/api/html/style.css
  soc2011/kulakov_ad/docs/api/html/up.png   (contents, props changed)
  soc2011/kulakov_ad/docs/api/migrating-to-09.xml
  soc2011/kulakov_ad/docs/api/network-manager-docs.xml
  soc2011/kulakov_ad/docs/api/settings-spec.xml
  soc2011/kulakov_ad/docs/api/spec.html
  soc2011/kulakov_ad/docs/api/tmpl/
  soc2011/kulakov_ad/docs/api/version.xml
  soc2011/kulakov_ad/docs/api/version.xml.in
  soc2011/kulakov_ad/docs/libnm-glib/
  soc2011/kulakov_ad/docs/libnm-glib/Makefile.am
  soc2011/kulakov_ad/docs/libnm-glib/Makefile.in
  soc2011/kulakov_ad/docs/libnm-glib/html/
  soc2011/kulakov_ad/docs/libnm-glib/html/NMAccessPoint.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMActiveConnection.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMClient.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDHCP4Config.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDHCP6Config.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDevice.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDeviceBt.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDeviceEthernet.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDeviceModem.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDeviceWifi.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMDeviceWimax.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMIP4Config.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMIP6Config.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMObject.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMRemoteConnection.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMRemoteSettings.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMSecretAgent.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMVPNConnection.html
  soc2011/kulakov_ad/docs/libnm-glib/html/NMWimaxNsp.html
  soc2011/kulakov_ad/docs/libnm-glib/html/annotation-glossary.html
  soc2011/kulakov_ad/docs/libnm-glib/html/api-index-full.html
  soc2011/kulakov_ad/docs/libnm-glib/html/ch02.html
  soc2011/kulakov_ad/docs/libnm-glib/html/home.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-glib/html/index.html
  soc2011/kulakov_ad/docs/libnm-glib/html/index.sgml
  soc2011/kulakov_ad/docs/libnm-glib/html/left.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
  soc2011/kulakov_ad/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
  soc2011/kulakov_ad/docs/libnm-glib/html/libnm-glib-nm-types.html
  soc2011/kulakov_ad/docs/libnm-glib/html/libnm-glib.devhelp
  soc2011/kulakov_ad/docs/libnm-glib/html/libnm-glib.devhelp2
  soc2011/kulakov_ad/docs/libnm-glib/html/libnm-glib.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-glib/html/object-tree.html
  soc2011/kulakov_ad/docs/libnm-glib/html/ref-overview.html
  soc2011/kulakov_ad/docs/libnm-glib/html/right.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-glib/html/style.css
  soc2011/kulakov_ad/docs/libnm-glib/html/up.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-glib/libnm-glib-docs.xml
  soc2011/kulakov_ad/docs/libnm-glib/libnm-glib-overrides.txt
  soc2011/kulakov_ad/docs/libnm-glib/libnm-glib-sections.txt
  soc2011/kulakov_ad/docs/libnm-glib/tmpl/
  soc2011/kulakov_ad/docs/libnm-util/
  soc2011/kulakov_ad/docs/libnm-util/Makefile.am
  soc2011/kulakov_ad/docs/libnm-util/Makefile.in
  soc2011/kulakov_ad/docs/libnm-util/html/
  soc2011/kulakov_ad/docs/libnm-util/html/NMConnection.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSetting.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSetting8021x.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingBluetooth.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingCdma.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingConnection.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingGsm.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingIP4Config.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingIP6Config.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingOlpcMesh.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingPPP.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingPPPOE.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingSerial.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingVPN.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingWired.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingWireless.html
  soc2011/kulakov_ad/docs/libnm-util/html/NMSettingWirelessSecurity.html
  soc2011/kulakov_ad/docs/libnm-util/html/annotation-glossary.html
  soc2011/kulakov_ad/docs/libnm-util/html/api-index-full.html
  soc2011/kulakov_ad/docs/libnm-util/html/ch01.html
  soc2011/kulakov_ad/docs/libnm-util/html/home.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-util/html/index.html
  soc2011/kulakov_ad/docs/libnm-util/html/index.sgml
  soc2011/kulakov_ad/docs/libnm-util/html/left.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-util/html/libnm-util-nm-utils.html
  soc2011/kulakov_ad/docs/libnm-util/html/libnm-util.devhelp
  soc2011/kulakov_ad/docs/libnm-util/html/libnm-util.devhelp2
  soc2011/kulakov_ad/docs/libnm-util/html/object-tree.html
  soc2011/kulakov_ad/docs/libnm-util/html/right.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-util/html/style.css
  soc2011/kulakov_ad/docs/libnm-util/html/up.png   (contents, props changed)
  soc2011/kulakov_ad/docs/libnm-util/libnm-util-docs.sgml
  soc2011/kulakov_ad/docs/libnm-util/libnm-util-overrides.txt
  soc2011/kulakov_ad/docs/libnm-util/libnm-util-sections.txt
  soc2011/kulakov_ad/docs/libnm-util/tmpl/
  soc2011/kulakov_ad/examples/
  soc2011/kulakov_ad/examples/C/
  soc2011/kulakov_ad/examples/C/Makefile.am
  soc2011/kulakov_ad/examples/C/Makefile.in
  soc2011/kulakov_ad/examples/C/glib/
  soc2011/kulakov_ad/examples/C/glib/Makefile.am
  soc2011/kulakov_ad/examples/C/glib/Makefile.in
  soc2011/kulakov_ad/examples/C/glib/add-connection-dbus-glib.c
  soc2011/kulakov_ad/examples/C/glib/add-connection-libnm-glib.c
  soc2011/kulakov_ad/examples/C/glib/get-active-connections-dbus-glib.c
  soc2011/kulakov_ad/examples/C/glib/get-ap-info-libnm-glib.c
  soc2011/kulakov_ad/examples/C/glib/list-connections-dbus-glib.c
  soc2011/kulakov_ad/examples/C/glib/list-connections-libnm-glib.c
  soc2011/kulakov_ad/examples/C/qt/
  soc2011/kulakov_ad/examples/C/qt/Makefile.am
  soc2011/kulakov_ad/examples/C/qt/Makefile.in
  soc2011/kulakov_ad/examples/C/qt/add-connection-wired.cpp
  soc2011/kulakov_ad/examples/C/qt/list-connections.cpp
  soc2011/kulakov_ad/examples/Makefile.am
  soc2011/kulakov_ad/examples/Makefile.in
  soc2011/kulakov_ad/examples/python/
  soc2011/kulakov_ad/examples/python/Makefile.am
  soc2011/kulakov_ad/examples/python/Makefile.in
  soc2011/kulakov_ad/examples/python/add-system-connection.py   (contents, props changed)
  soc2011/kulakov_ad/examples/python/add-system-wifi-connection.py   (contents, props changed)
  soc2011/kulakov_ad/examples/python/nm-state.py
  soc2011/kulakov_ad/gtk-doc.make
  soc2011/kulakov_ad/include/
  soc2011/kulakov_ad/include/Makefile.am
  soc2011/kulakov_ad/include/Makefile.in
  soc2011/kulakov_ad/include/NetworkManager.h
  soc2011/kulakov_ad/include/NetworkManagerVPN.h
  soc2011/kulakov_ad/include/nm-dbus-glib-types.h
  soc2011/kulakov_ad/include/nm-glib-compat.h
  soc2011/kulakov_ad/include/nm-settings-flags.h
  soc2011/kulakov_ad/include/nm-test-helpers.h
  soc2011/kulakov_ad/include/nm-version.h
  soc2011/kulakov_ad/include/nm-version.h.in
  soc2011/kulakov_ad/include/wireless-helper.h
  soc2011/kulakov_ad/initscript/
  soc2011/kulakov_ad/initscript/Arch/
  soc2011/kulakov_ad/initscript/Arch/Makefile.am
  soc2011/kulakov_ad/initscript/Arch/Makefile.in
  soc2011/kulakov_ad/initscript/Arch/networkmanager.in
  soc2011/kulakov_ad/initscript/Debian/
  soc2011/kulakov_ad/initscript/Debian/Makefile.am
  soc2011/kulakov_ad/initscript/Debian/Makefile.in
  soc2011/kulakov_ad/initscript/Debian/NetworkManager.in   (contents, props changed)
  soc2011/kulakov_ad/initscript/Gentoo/
  soc2011/kulakov_ad/initscript/Gentoo/Makefile.am
  soc2011/kulakov_ad/initscript/Gentoo/Makefile.in
  soc2011/kulakov_ad/initscript/Gentoo/NetworkManager.in   (contents, props changed)
  soc2011/kulakov_ad/initscript/Makefile.am
  soc2011/kulakov_ad/initscript/Makefile.in
  soc2011/kulakov_ad/initscript/Mandriva/
  soc2011/kulakov_ad/initscript/Mandriva/Makefile.am
  soc2011/kulakov_ad/initscript/Mandriva/Makefile.in
  soc2011/kulakov_ad/initscript/Mandriva/networkmanager.in
  soc2011/kulakov_ad/initscript/RedHat/
  soc2011/kulakov_ad/initscript/RedHat/Makefile.am
  soc2011/kulakov_ad/initscript/RedHat/Makefile.in
  soc2011/kulakov_ad/initscript/RedHat/NetworkManager.in   (contents, props changed)
  soc2011/kulakov_ad/initscript/SUSE/
  soc2011/kulakov_ad/initscript/SUSE/Makefile.am
  soc2011/kulakov_ad/initscript/SUSE/Makefile.in
  soc2011/kulakov_ad/initscript/SUSE/networkmanager.in
  soc2011/kulakov_ad/initscript/Slackware/
  soc2011/kulakov_ad/initscript/Slackware/Makefile.am
  soc2011/kulakov_ad/initscript/Slackware/Makefile.in
  soc2011/kulakov_ad/initscript/Slackware/rc.networkmanager.in
  soc2011/kulakov_ad/initscript/linexa/
  soc2011/kulakov_ad/initscript/linexa/Makefile.am
  soc2011/kulakov_ad/initscript/linexa/Makefile.in
  soc2011/kulakov_ad/initscript/linexa/networkmanager.in
  soc2011/kulakov_ad/initscript/paldo/
  soc2011/kulakov_ad/initscript/paldo/Makefile.am
  soc2011/kulakov_ad/initscript/paldo/Makefile.in
  soc2011/kulakov_ad/initscript/paldo/NetworkManager.in
  soc2011/kulakov_ad/install-sh   (contents, props changed)
  soc2011/kulakov_ad/intltool-extract.in
  soc2011/kulakov_ad/intltool-merge.in
  soc2011/kulakov_ad/intltool-update.in
  soc2011/kulakov_ad/introspection/
  soc2011/kulakov_ad/introspection/Makefile.am
  soc2011/kulakov_ad/introspection/Makefile.in
  soc2011/kulakov_ad/introspection/all.xml
  soc2011/kulakov_ad/introspection/errors.xml
  soc2011/kulakov_ad/introspection/generic-types.xml
  soc2011/kulakov_ad/introspection/nm-access-point.xml
  soc2011/kulakov_ad/introspection/nm-active-connection.xml
  soc2011/kulakov_ad/introspection/nm-agent-manager.xml
  soc2011/kulakov_ad/introspection/nm-device-bt.xml
  soc2011/kulakov_ad/introspection/nm-device-ethernet.xml
  soc2011/kulakov_ad/introspection/nm-device-modem.xml
  soc2011/kulakov_ad/introspection/nm-device-olpc-mesh.xml
  soc2011/kulakov_ad/introspection/nm-device-wifi.xml
  soc2011/kulakov_ad/introspection/nm-device-wimax.xml
  soc2011/kulakov_ad/introspection/nm-device.xml
  soc2011/kulakov_ad/introspection/nm-dhcp4-config.xml
  soc2011/kulakov_ad/introspection/nm-dhcp6-config.xml
  soc2011/kulakov_ad/introspection/nm-ip4-config.xml
  soc2011/kulakov_ad/introspection/nm-ip6-config.xml
  soc2011/kulakov_ad/introspection/nm-manager.xml
  soc2011/kulakov_ad/introspection/nm-ppp-manager.xml
  soc2011/kulakov_ad/introspection/nm-secret-agent.xml
  soc2011/kulakov_ad/introspection/nm-settings-connection.xml
  soc2011/kulakov_ad/introspection/nm-settings.xml
  soc2011/kulakov_ad/introspection/nm-vpn-connection.xml
  soc2011/kulakov_ad/introspection/nm-vpn-plugin.xml
  soc2011/kulakov_ad/introspection/nm-wimax-nsp.xml
  soc2011/kulakov_ad/introspection/vpn-errors.xml
  soc2011/kulakov_ad/libnm-glib/
  soc2011/kulakov_ad/libnm-glib/Makefile.am
  soc2011/kulakov_ad/libnm-glib/Makefile.in
  soc2011/kulakov_ad/libnm-glib/libnm-glib-test.c
  soc2011/kulakov_ad/libnm-glib/libnm-glib-vpn.pc.in
  soc2011/kulakov_ad/libnm-glib/libnm-glib-vpn.ver
  soc2011/kulakov_ad/libnm-glib/libnm-glib.pc.in
  soc2011/kulakov_ad/libnm-glib/libnm-glib.ver
  soc2011/kulakov_ad/libnm-glib/libnm_glib.c
  soc2011/kulakov_ad/libnm-glib/libnm_glib.h
  soc2011/kulakov_ad/libnm-glib/nm-access-point.c
  soc2011/kulakov_ad/libnm-glib/nm-access-point.h
  soc2011/kulakov_ad/libnm-glib/nm-active-connection.c
  soc2011/kulakov_ad/libnm-glib/nm-active-connection.h
  soc2011/kulakov_ad/libnm-glib/nm-client.c
  soc2011/kulakov_ad/libnm-glib/nm-client.h
  soc2011/kulakov_ad/libnm-glib/nm-dbus-utils.c
  soc2011/kulakov_ad/libnm-glib/nm-dbus-utils.h
  soc2011/kulakov_ad/libnm-glib/nm-device-bt.c
  soc2011/kulakov_ad/libnm-glib/nm-device-bt.h
  soc2011/kulakov_ad/libnm-glib/nm-device-ethernet.c
  soc2011/kulakov_ad/libnm-glib/nm-device-ethernet.h
  soc2011/kulakov_ad/libnm-glib/nm-device-modem.c
  soc2011/kulakov_ad/libnm-glib/nm-device-modem.h
  soc2011/kulakov_ad/libnm-glib/nm-device-private.h
  soc2011/kulakov_ad/libnm-glib/nm-device-wifi.c
  soc2011/kulakov_ad/libnm-glib/nm-device-wifi.h
  soc2011/kulakov_ad/libnm-glib/nm-device-wimax.c
  soc2011/kulakov_ad/libnm-glib/nm-device-wimax.h
  soc2011/kulakov_ad/libnm-glib/nm-device.c
  soc2011/kulakov_ad/libnm-glib/nm-device.h
  soc2011/kulakov_ad/libnm-glib/nm-dhcp4-config.c
  soc2011/kulakov_ad/libnm-glib/nm-dhcp4-config.h
  soc2011/kulakov_ad/libnm-glib/nm-dhcp6-config.c
  soc2011/kulakov_ad/libnm-glib/nm-dhcp6-config.h
  soc2011/kulakov_ad/libnm-glib/nm-ip4-config.c
  soc2011/kulakov_ad/libnm-glib/nm-ip4-config.h
  soc2011/kulakov_ad/libnm-glib/nm-ip6-config.c
  soc2011/kulakov_ad/libnm-glib/nm-ip6-config.h
  soc2011/kulakov_ad/libnm-glib/nm-object-cache.c
  soc2011/kulakov_ad/libnm-glib/nm-object-cache.h
  soc2011/kulakov_ad/libnm-glib/nm-object-private.h
  soc2011/kulakov_ad/libnm-glib/nm-object.c
  soc2011/kulakov_ad/libnm-glib/nm-object.h
  soc2011/kulakov_ad/libnm-glib/nm-remote-connection-private.h
  soc2011/kulakov_ad/libnm-glib/nm-remote-connection.c
  soc2011/kulakov_ad/libnm-glib/nm-remote-connection.h
  soc2011/kulakov_ad/libnm-glib/nm-remote-settings.c
  soc2011/kulakov_ad/libnm-glib/nm-remote-settings.h
  soc2011/kulakov_ad/libnm-glib/nm-secret-agent.c
  soc2011/kulakov_ad/libnm-glib/nm-secret-agent.h
  soc2011/kulakov_ad/libnm-glib/nm-types-private.h
  soc2011/kulakov_ad/libnm-glib/nm-types.c
  soc2011/kulakov_ad/libnm-glib/nm-types.h
  soc2011/kulakov_ad/libnm-glib/nm-vpn-connection.c
  soc2011/kulakov_ad/libnm-glib/nm-vpn-connection.h
  soc2011/kulakov_ad/libnm-glib/nm-vpn-plugin-ui-interface.c
  soc2011/kulakov_ad/libnm-glib/nm-vpn-plugin-ui-interface.h
  soc2011/kulakov_ad/libnm-glib/nm-vpn-plugin-utils.c
  soc2011/kulakov_ad/libnm-glib/nm-vpn-plugin-utils.h
  soc2011/kulakov_ad/libnm-glib/nm-vpn-plugin.c
  soc2011/kulakov_ad/libnm-glib/nm-vpn-plugin.h
  soc2011/kulakov_ad/libnm-glib/nm-wimax-nsp.c
  soc2011/kulakov_ad/libnm-glib/nm-wimax-nsp.h
  soc2011/kulakov_ad/libnm-glib/tests/
  soc2011/kulakov_ad/libnm-glib/tests/Makefile.am
  soc2011/kulakov_ad/libnm-glib/tests/Makefile.in
  soc2011/kulakov_ad/libnm-glib/tests/test-remote-settings-client.c
  soc2011/kulakov_ad/libnm-glib/tests/test-remote-settings-service.py   (contents, props changed)
  soc2011/kulakov_ad/libnm-util/
  soc2011/kulakov_ad/libnm-util/COPYING
  soc2011/kulakov_ad/libnm-util/Makefile.am
  soc2011/kulakov_ad/libnm-util/Makefile.in
  soc2011/kulakov_ad/libnm-util/crypto.c
  soc2011/kulakov_ad/libnm-util/crypto.h
  soc2011/kulakov_ad/libnm-util/crypto_gnutls.c
  soc2011/kulakov_ad/libnm-util/crypto_nss.c
  soc2011/kulakov_ad/libnm-util/libnm-util.pc.in
  soc2011/kulakov_ad/libnm-util/libnm-util.ver
  soc2011/kulakov_ad/libnm-util/nm-connection.c
  soc2011/kulakov_ad/libnm-util/nm-connection.h
  soc2011/kulakov_ad/libnm-util/nm-param-spec-specialized.c
  soc2011/kulakov_ad/libnm-util/nm-param-spec-specialized.h
  soc2011/kulakov_ad/libnm-util/nm-setting-8021x.c
  soc2011/kulakov_ad/libnm-util/nm-setting-8021x.h
  soc2011/kulakov_ad/libnm-util/nm-setting-bluetooth.c
  soc2011/kulakov_ad/libnm-util/nm-setting-bluetooth.h
  soc2011/kulakov_ad/libnm-util/nm-setting-cdma.c
  soc2011/kulakov_ad/libnm-util/nm-setting-cdma.h
  soc2011/kulakov_ad/libnm-util/nm-setting-connection.c
  soc2011/kulakov_ad/libnm-util/nm-setting-connection.h
  soc2011/kulakov_ad/libnm-util/nm-setting-gsm.c
  soc2011/kulakov_ad/libnm-util/nm-setting-gsm.h
  soc2011/kulakov_ad/libnm-util/nm-setting-ip4-config.c
  soc2011/kulakov_ad/libnm-util/nm-setting-ip4-config.h
  soc2011/kulakov_ad/libnm-util/nm-setting-ip6-config.c
  soc2011/kulakov_ad/libnm-util/nm-setting-ip6-config.h
  soc2011/kulakov_ad/libnm-util/nm-setting-olpc-mesh.c
  soc2011/kulakov_ad/libnm-util/nm-setting-olpc-mesh.h
  soc2011/kulakov_ad/libnm-util/nm-setting-ppp.c
  soc2011/kulakov_ad/libnm-util/nm-setting-ppp.h
  soc2011/kulakov_ad/libnm-util/nm-setting-pppoe.c
  soc2011/kulakov_ad/libnm-util/nm-setting-pppoe.h
  soc2011/kulakov_ad/libnm-util/nm-setting-private.h
  soc2011/kulakov_ad/libnm-util/nm-setting-serial.c
  soc2011/kulakov_ad/libnm-util/nm-setting-serial.h
  soc2011/kulakov_ad/libnm-util/nm-setting-vpn.c
  soc2011/kulakov_ad/libnm-util/nm-setting-vpn.h
  soc2011/kulakov_ad/libnm-util/nm-setting-wimax.c
  soc2011/kulakov_ad/libnm-util/nm-setting-wimax.h
  soc2011/kulakov_ad/libnm-util/nm-setting-wired.c
  soc2011/kulakov_ad/libnm-util/nm-setting-wired.h
  soc2011/kulakov_ad/libnm-util/nm-setting-wireless-security.c
  soc2011/kulakov_ad/libnm-util/nm-setting-wireless-security.h
  soc2011/kulakov_ad/libnm-util/nm-setting-wireless.c
  soc2011/kulakov_ad/libnm-util/nm-setting-wireless.h
  soc2011/kulakov_ad/libnm-util/nm-setting.c
  soc2011/kulakov_ad/libnm-util/nm-setting.h
  soc2011/kulakov_ad/libnm-util/nm-utils-private.h
  soc2011/kulakov_ad/libnm-util/nm-utils.c
  soc2011/kulakov_ad/libnm-util/nm-utils.h
  soc2011/kulakov_ad/libnm-util/tests/
  soc2011/kulakov_ad/libnm-util/tests/Makefile.am
  soc2011/kulakov_ad/libnm-util/tests/Makefile.in
  soc2011/kulakov_ad/libnm-util/tests/certs/
  soc2011/kulakov_ad/libnm-util/tests/certs/Makefile.am
  soc2011/kulakov_ad/libnm-util/tests/certs/Makefile.in
  soc2011/kulakov_ad/libnm-util/tests/certs/ca-no-ending-newline.pem
  soc2011/kulakov_ad/libnm-util/tests/certs/pkcs8-decrypted.der   (contents, props changed)
  soc2011/kulakov_ad/libnm-util/tests/certs/pkcs8-enc-key.pem
  soc2011/kulakov_ad/libnm-util/tests/certs/pkcs8-noenc-key.pem
  soc2011/kulakov_ad/libnm-util/tests/certs/test-cert.p12   (contents, props changed)
  soc2011/kulakov_ad/libnm-util/tests/certs/test-key-only-decrypted.der   (contents, props changed)
  soc2011/kulakov_ad/libnm-util/tests/certs/test-key-only.pem
  soc2011/kulakov_ad/libnm-util/tests/certs/test2-cert.p12   (contents, props changed)
  soc2011/kulakov_ad/libnm-util/tests/certs/test2_ca_cert.pem
  soc2011/kulakov_ad/libnm-util/tests/certs/test2_key_and_cert.pem
  soc2011/kulakov_ad/libnm-util/tests/certs/test_ca_cert.der   (contents, props changed)
  soc2011/kulakov_ad/libnm-util/tests/certs/test_ca_cert.pem
  soc2011/kulakov_ad/libnm-util/tests/certs/test_key_and_cert.pem
  soc2011/kulakov_ad/libnm-util/tests/test-crypto.c
  soc2011/kulakov_ad/libnm-util/tests/test-general.c
  soc2011/kulakov_ad/libnm-util/tests/test-secrets.c
  soc2011/kulakov_ad/libnm-util/tests/test-setting-8021x.c
  soc2011/kulakov_ad/libnm-util/tests/test-settings-defaults.c
  soc2011/kulakov_ad/ltmain.sh   (contents, props changed)
  soc2011/kulakov_ad/m4/
  soc2011/kulakov_ad/m4/compiler_warnings.m4
  soc2011/kulakov_ad/m4/gettext.m4
  soc2011/kulakov_ad/m4/gtk-doc.m4
  soc2011/kulakov_ad/m4/iconv.m4
  soc2011/kulakov_ad/m4/intlmacosx.m4
  soc2011/kulakov_ad/m4/intltool.m4
  soc2011/kulakov_ad/m4/introspection.m4
  soc2011/kulakov_ad/m4/lib-ld.m4
  soc2011/kulakov_ad/m4/lib-link.m4
  soc2011/kulakov_ad/m4/lib-prefix.m4
  soc2011/kulakov_ad/m4/libnl-check.m4
  soc2011/kulakov_ad/m4/libtool.m4
  soc2011/kulakov_ad/m4/ltoptions.m4
  soc2011/kulakov_ad/m4/ltsugar.m4
  soc2011/kulakov_ad/m4/ltversion.m4
  soc2011/kulakov_ad/m4/lt~obsolete.m4
  soc2011/kulakov_ad/m4/nls.m4
  soc2011/kulakov_ad/m4/po.m4
  soc2011/kulakov_ad/m4/progtest.m4
  soc2011/kulakov_ad/man/
  soc2011/kulakov_ad/man/Makefile.am
  soc2011/kulakov_ad/man/Makefile.in
  soc2011/kulakov_ad/man/NetworkManager.8
  soc2011/kulakov_ad/man/NetworkManager.8.in
  soc2011/kulakov_ad/man/NetworkManager.conf.5
  soc2011/kulakov_ad/man/NetworkManager.conf.5.in
  soc2011/kulakov_ad/man/nm-online.1
  soc2011/kulakov_ad/man/nm-online.1.in
  soc2011/kulakov_ad/man/nm-system-settings.conf.5
  soc2011/kulakov_ad/man/nm-system-settings.conf.5.in
  soc2011/kulakov_ad/man/nm-tool.1
  soc2011/kulakov_ad/man/nm-tool.1.in
  soc2011/kulakov_ad/man/nmcli.1
  soc2011/kulakov_ad/man/nmcli.1.in
  soc2011/kulakov_ad/marshallers/
  soc2011/kulakov_ad/marshallers/Makefile.am
  soc2011/kulakov_ad/marshallers/Makefile.in
  soc2011/kulakov_ad/marshallers/nm-marshal-main.c
  soc2011/kulakov_ad/marshallers/nm-marshal.list
  soc2011/kulakov_ad/missing   (contents, props changed)
  soc2011/kulakov_ad/po/
  soc2011/kulakov_ad/po/ChangeLog
  soc2011/kulakov_ad/po/LINGUAS
  soc2011/kulakov_ad/po/Makefile.in.in
  soc2011/kulakov_ad/po/POTFILES.in
  soc2011/kulakov_ad/po/POTFILES.skip
  soc2011/kulakov_ad/po/ar.po
  soc2011/kulakov_ad/po/as.po
  soc2011/kulakov_ad/po/be@latin.po
  soc2011/kulakov_ad/po/bg.po
  soc2011/kulakov_ad/po/bn_IN.po
  soc2011/kulakov_ad/po/bs.po
  soc2011/kulakov_ad/po/ca.po
  soc2011/kulakov_ad/po/cs.po
  soc2011/kulakov_ad/po/da.po
  soc2011/kulakov_ad/po/de.po
  soc2011/kulakov_ad/po/dz.po
  soc2011/kulakov_ad/po/el.po
  soc2011/kulakov_ad/po/en_CA.po
  soc2011/kulakov_ad/po/en_GB.po
  soc2011/kulakov_ad/po/eo.po
  soc2011/kulakov_ad/po/es.po
  soc2011/kulakov_ad/po/et.po
  soc2011/kulakov_ad/po/eu.po
  soc2011/kulakov_ad/po/fi.po
  soc2011/kulakov_ad/po/fr.po
  soc2011/kulakov_ad/po/gl.po
  soc2011/kulakov_ad/po/gu.po
  soc2011/kulakov_ad/po/he.po
  soc2011/kulakov_ad/po/hi.po
  soc2011/kulakov_ad/po/hr.po
  soc2011/kulakov_ad/po/hu.po
  soc2011/kulakov_ad/po/id.po
  soc2011/kulakov_ad/po/it.po
  soc2011/kulakov_ad/po/ja.po
  soc2011/kulakov_ad/po/ka.po
  soc2011/kulakov_ad/po/kn.po
  soc2011/kulakov_ad/po/ko.po
  soc2011/kulakov_ad/po/ku.po
  soc2011/kulakov_ad/po/lt.po
  soc2011/kulakov_ad/po/lv.po
  soc2011/kulakov_ad/po/mk.po
  soc2011/kulakov_ad/po/ml.po
  soc2011/kulakov_ad/po/mr.po
  soc2011/kulakov_ad/po/nb.po
  soc2011/kulakov_ad/po/ne.po
  soc2011/kulakov_ad/po/nl.po
  soc2011/kulakov_ad/po/oc.po
  soc2011/kulakov_ad/po/or.po
  soc2011/kulakov_ad/po/pa.po
  soc2011/kulakov_ad/po/pl.po
  soc2011/kulakov_ad/po/pt.po
  soc2011/kulakov_ad/po/pt_BR.po
  soc2011/kulakov_ad/po/ru.po
  soc2011/kulakov_ad/po/rw.po
  soc2011/kulakov_ad/po/sk.po
  soc2011/kulakov_ad/po/sl.po
  soc2011/kulakov_ad/po/sq.po
  soc2011/kulakov_ad/po/sr.po
  soc2011/kulakov_ad/po/sr@latin.po
  soc2011/kulakov_ad/po/sv.po
  soc2011/kulakov_ad/po/ta.po
  soc2011/kulakov_ad/po/te.po
  soc2011/kulakov_ad/po/th.po
  soc2011/kulakov_ad/po/uk.po
  soc2011/kulakov_ad/po/vi.po
  soc2011/kulakov_ad/po/wa.po
  soc2011/kulakov_ad/po/zh_CN.po
  soc2011/kulakov_ad/po/zh_HK.po
  soc2011/kulakov_ad/po/zh_TW.po
  soc2011/kulakov_ad/policy/
  soc2011/kulakov_ad/policy/Makefile.am
  soc2011/kulakov_ad/policy/Makefile.in
  soc2011/kulakov_ad/policy/org.freedesktop.NetworkManager.policy
  soc2011/kulakov_ad/policy/org.freedesktop.NetworkManager.policy.in
  soc2011/kulakov_ad/src/
  soc2011/kulakov_ad/src/Makefile.am
  soc2011/kulakov_ad/src/Makefile.in
  soc2011/kulakov_ad/src/NetworkManager.conf
  soc2011/kulakov_ad/src/NetworkManagerUtils.c
  soc2011/kulakov_ad/src/NetworkManagerUtils.h
  soc2011/kulakov_ad/src/backends/
  soc2011/kulakov_ad/src/backends/Makefile.am
  soc2011/kulakov_ad/src/backends/Makefile.in
  soc2011/kulakov_ad/src/backends/NetworkManagerArch.c
  soc2011/kulakov_ad/src/backends/NetworkManagerDebian.c
  soc2011/kulakov_ad/src/backends/NetworkManagerExherbo.c
  soc2011/kulakov_ad/src/backends/NetworkManagerFrugalware.c
  soc2011/kulakov_ad/src/backends/NetworkManagerGeneric.c
  soc2011/kulakov_ad/src/backends/NetworkManagerGeneric.h
  soc2011/kulakov_ad/src/backends/NetworkManagerGentoo.c
  soc2011/kulakov_ad/src/backends/NetworkManagerLinexa.c
  soc2011/kulakov_ad/src/backends/NetworkManagerMandriva.c
  soc2011/kulakov_ad/src/backends/NetworkManagerPaldo.c
  soc2011/kulakov_ad/src/backends/NetworkManagerPardus.c
  soc2011/kulakov_ad/src/backends/NetworkManagerRedHat.c
  soc2011/kulakov_ad/src/backends/NetworkManagerSlackware.c
  soc2011/kulakov_ad/src/backends/NetworkManagerSuSE.c
  soc2011/kulakov_ad/src/bluez-manager/
  soc2011/kulakov_ad/src/bluez-manager/Makefile.am
  soc2011/kulakov_ad/src/bluez-manager/Makefile.in
  soc2011/kulakov_ad/src/bluez-manager/nm-bluez-adapter.c
  soc2011/kulakov_ad/src/bluez-manager/nm-bluez-adapter.h
  soc2011/kulakov_ad/src/bluez-manager/nm-bluez-common.h
  soc2011/kulakov_ad/src/bluez-manager/nm-bluez-device.c
  soc2011/kulakov_ad/src/bluez-manager/nm-bluez-device.h
  soc2011/kulakov_ad/src/bluez-manager/nm-bluez-manager.c
  soc2011/kulakov_ad/src/bluez-manager/nm-bluez-manager.h
  soc2011/kulakov_ad/src/dhcp-manager/
  soc2011/kulakov_ad/src/dhcp-manager/Makefile.am
  soc2011/kulakov_ad/src/dhcp-manager/Makefile.in
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-client.c
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-client.h
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-dhclient-utils.c
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-dhclient-utils.h
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-dhclient.c
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-dhclient.h
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-dhcpcd.c
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-dhcpcd.h
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-manager.c
  soc2011/kulakov_ad/src/dhcp-manager/nm-dhcp-manager.h
  soc2011/kulakov_ad/src/dhcp-manager/tests/
  soc2011/kulakov_ad/src/dhcp-manager/tests/Makefile.am
  soc2011/kulakov_ad/src/dhcp-manager/tests/Makefile.in
  soc2011/kulakov_ad/src/dhcp-manager/tests/test-dhcp-dhclient.c
  soc2011/kulakov_ad/src/dns-manager/
  soc2011/kulakov_ad/src/dns-manager/Makefile.am
  soc2011/kulakov_ad/src/dns-manager/Makefile.in
  soc2011/kulakov_ad/src/dns-manager/nm-dns-bind.c
  soc2011/kulakov_ad/src/dns-manager/nm-dns-bind.h
  soc2011/kulakov_ad/src/dns-manager/nm-dns-dnsmasq.c
  soc2011/kulakov_ad/src/dns-manager/nm-dns-dnsmasq.h
  soc2011/kulakov_ad/src/dns-manager/nm-dns-manager.c
  soc2011/kulakov_ad/src/dns-manager/nm-dns-manager.h
  soc2011/kulakov_ad/src/dns-manager/nm-dns-plugin.c
  soc2011/kulakov_ad/src/dns-manager/nm-dns-plugin.h
  soc2011/kulakov_ad/src/dns-manager/nm-dns-utils.c
  soc2011/kulakov_ad/src/dns-manager/nm-dns-utils.h
  soc2011/kulakov_ad/src/dnsmasq-manager/
  soc2011/kulakov_ad/src/dnsmasq-manager/Makefile.am
  soc2011/kulakov_ad/src/dnsmasq-manager/Makefile.in
  soc2011/kulakov_ad/src/dnsmasq-manager/nm-dnsmasq-manager.c
  soc2011/kulakov_ad/src/dnsmasq-manager/nm-dnsmasq-manager.h
  soc2011/kulakov_ad/src/gdb-cmd
  soc2011/kulakov_ad/src/ip6-manager/
  soc2011/kulakov_ad/src/ip6-manager/Makefile.am
  soc2011/kulakov_ad/src/ip6-manager/Makefile.in
  soc2011/kulakov_ad/src/ip6-manager/nm-ip6-manager.c
  soc2011/kulakov_ad/src/ip6-manager/nm-ip6-manager.h
  soc2011/kulakov_ad/src/logging/
  soc2011/kulakov_ad/src/logging/Makefile.am
  soc2011/kulakov_ad/src/logging/Makefile.in
  soc2011/kulakov_ad/src/logging/nm-logging.c
  soc2011/kulakov_ad/src/logging/nm-logging.h
  soc2011/kulakov_ad/src/main.c
  soc2011/kulakov_ad/src/modem-manager/
  soc2011/kulakov_ad/src/modem-manager/Makefile.am
  soc2011/kulakov_ad/src/modem-manager/Makefile.in
  soc2011/kulakov_ad/src/modem-manager/nm-modem-cdma.c
  soc2011/kulakov_ad/src/modem-manager/nm-modem-cdma.h
  soc2011/kulakov_ad/src/modem-manager/nm-modem-gsm.c
  soc2011/kulakov_ad/src/modem-manager/nm-modem-gsm.h
  soc2011/kulakov_ad/src/modem-manager/nm-modem-manager.c
  soc2011/kulakov_ad/src/modem-manager/nm-modem-manager.h
  soc2011/kulakov_ad/src/modem-manager/nm-modem-types.h
  soc2011/kulakov_ad/src/modem-manager/nm-modem.c
  soc2011/kulakov_ad/src/modem-manager/nm-modem.h
  soc2011/kulakov_ad/src/nm-activation-request.c
  soc2011/kulakov_ad/src/nm-activation-request.h
  soc2011/kulakov_ad/src/nm-active-connection.c
  soc2011/kulakov_ad/src/nm-active-connection.h
  soc2011/kulakov_ad/src/nm-call-store.c
  soc2011/kulakov_ad/src/nm-call-store.h
  soc2011/kulakov_ad/src/nm-crash-logger.c
  soc2011/kulakov_ad/src/nm-dbus-manager.c
  soc2011/kulakov_ad/src/nm-dbus-manager.h
  soc2011/kulakov_ad/src/nm-device-bt.c
  soc2011/kulakov_ad/src/nm-device-bt.h
  soc2011/kulakov_ad/src/nm-device-ethernet.c
  soc2011/kulakov_ad/src/nm-device-ethernet.h
  soc2011/kulakov_ad/src/nm-device-interface.c
  soc2011/kulakov_ad/src/nm-device-interface.h
  soc2011/kulakov_ad/src/nm-device-modem.c
  soc2011/kulakov_ad/src/nm-device-modem.h
  soc2011/kulakov_ad/src/nm-device-olpc-mesh.c
  soc2011/kulakov_ad/src/nm-device-olpc-mesh.h
  soc2011/kulakov_ad/src/nm-device-private.h
  soc2011/kulakov_ad/src/nm-device-wifi.c
  soc2011/kulakov_ad/src/nm-device-wifi.h
  soc2011/kulakov_ad/src/nm-device.c
  soc2011/kulakov_ad/src/nm-device.h
  soc2011/kulakov_ad/src/nm-dhcp4-config.c
  soc2011/kulakov_ad/src/nm-dhcp4-config.h
  soc2011/kulakov_ad/src/nm-dhcp6-config.c
  soc2011/kulakov_ad/src/nm-dhcp6-config.h
  soc2011/kulakov_ad/src/nm-hostname-provider.c
  soc2011/kulakov_ad/src/nm-hostname-provider.h
  soc2011/kulakov_ad/src/nm-ip4-config.c
  soc2011/kulakov_ad/src/nm-ip4-config.h
  soc2011/kulakov_ad/src/nm-ip6-config.c
  soc2011/kulakov_ad/src/nm-ip6-config.h
  soc2011/kulakov_ad/src/nm-manager-auth.c
  soc2011/kulakov_ad/src/nm-manager-auth.h
  soc2011/kulakov_ad/src/nm-manager.c
  soc2011/kulakov_ad/src/nm-manager.h
  soc2011/kulakov_ad/src/nm-netlink-monitor.c
  soc2011/kulakov_ad/src/nm-netlink-monitor.h
  soc2011/kulakov_ad/src/nm-policy-hostname.c
  soc2011/kulakov_ad/src/nm-policy-hostname.h
  soc2011/kulakov_ad/src/nm-policy-hosts.c
  soc2011/kulakov_ad/src/nm-policy-hosts.h
  soc2011/kulakov_ad/src/nm-policy.c
  soc2011/kulakov_ad/src/nm-policy.h
  soc2011/kulakov_ad/src/nm-properties-changed-signal.c
  soc2011/kulakov_ad/src/nm-properties-changed-signal.h
  soc2011/kulakov_ad/src/nm-rfkill.h
  soc2011/kulakov_ad/src/nm-session-monitor.c
  soc2011/kulakov_ad/src/nm-session-monitor.h
  soc2011/kulakov_ad/src/nm-system.c
  soc2011/kulakov_ad/src/nm-system.h
  soc2011/kulakov_ad/src/nm-udev-manager.c
  soc2011/kulakov_ad/src/nm-udev-manager.h
  soc2011/kulakov_ad/src/nm-wifi-ap-utils.c
  soc2011/kulakov_ad/src/nm-wifi-ap-utils.h
  soc2011/kulakov_ad/src/nm-wifi-ap.c
  soc2011/kulakov_ad/src/nm-wifi-ap.h
  soc2011/kulakov_ad/src/ppp-manager/
  soc2011/kulakov_ad/src/ppp-manager/Makefile.am
  soc2011/kulakov_ad/src/ppp-manager/Makefile.in
  soc2011/kulakov_ad/src/ppp-manager/nm-ppp-manager.c
  soc2011/kulakov_ad/src/ppp-manager/nm-ppp-manager.h
  soc2011/kulakov_ad/src/ppp-manager/nm-ppp-status.h
  soc2011/kulakov_ad/src/ppp-manager/nm-pppd-plugin.c
  soc2011/kulakov_ad/src/ppp-manager/nm-pppd-plugin.h
  soc2011/kulakov_ad/src/settings/
  soc2011/kulakov_ad/src/settings/Makefile.am
  soc2011/kulakov_ad/src/settings/Makefile.in
  soc2011/kulakov_ad/src/settings/nm-agent-manager.c
  soc2011/kulakov_ad/src/settings/nm-agent-manager.h
  soc2011/kulakov_ad/src/settings/nm-default-wired-connection.c
  soc2011/kulakov_ad/src/settings/nm-default-wired-connection.h
  soc2011/kulakov_ad/src/settings/nm-inotify-helper.c
  soc2011/kulakov_ad/src/settings/nm-inotify-helper.h
  soc2011/kulakov_ad/src/settings/nm-secret-agent.c
  soc2011/kulakov_ad/src/settings/nm-secret-agent.h
  soc2011/kulakov_ad/src/settings/nm-settings-connection.c
  soc2011/kulakov_ad/src/settings/nm-settings-connection.h
  soc2011/kulakov_ad/src/settings/nm-settings-error.c
  soc2011/kulakov_ad/src/settings/nm-settings-error.h
  soc2011/kulakov_ad/src/settings/nm-settings-utils.c
  soc2011/kulakov_ad/src/settings/nm-settings-utils.h
  soc2011/kulakov_ad/src/settings/nm-settings.c
  soc2011/kulakov_ad/src/settings/nm-settings.h
  soc2011/kulakov_ad/src/settings/nm-system-config-interface.c
  soc2011/kulakov_ad/src/settings/nm-system-config-interface.h
  soc2011/kulakov_ad/src/settings/plugins/
  soc2011/kulakov_ad/src/settings/plugins/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/common.h
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/errors.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/plugin.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/plugin.h
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/reader.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/reader.h
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/shvar.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/shvar.h
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns1   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns2   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-entry   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-gateway   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-ipaddr   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-record   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-dhcp   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-static   (contents, props changed)
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/utils.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/utils.h
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/writer.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-rh/writer.h
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-suse/
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-suse/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-suse/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-suse/plugin.c
  soc2011/kulakov_ad/src/settings/plugins/ifcfg-suse/plugin.h
  soc2011/kulakov_ad/src/settings/plugins/ifnet/
  soc2011/kulakov_ad/src/settings/plugins/ifnet/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifnet/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifnet/connection_parser.c
  soc2011/kulakov_ad/src/settings/plugins/ifnet/connection_parser.h
  soc2011/kulakov_ad/src/settings/plugins/ifnet/net_parser.c
  soc2011/kulakov_ad/src/settings/plugins/ifnet/net_parser.h
  soc2011/kulakov_ad/src/settings/plugins/ifnet/net_utils.c
  soc2011/kulakov_ad/src/settings/plugins/ifnet/net_utils.h
  soc2011/kulakov_ad/src/settings/plugins/ifnet/nm-ifnet-connection.c
  soc2011/kulakov_ad/src/settings/plugins/ifnet/nm-ifnet-connection.h
  soc2011/kulakov_ad/src/settings/plugins/ifnet/plugin.c
  soc2011/kulakov_ad/src/settings/plugins/ifnet/plugin.h
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/hostname
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/net
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/net.all
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/nm-system-settings.conf
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/test_all.c
  soc2011/kulakov_ad/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
  soc2011/kulakov_ad/src/settings/plugins/ifnet/wpa_parser.c
  soc2011/kulakov_ad/src/settings/plugins/ifnet/wpa_parser.h
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/interface_parser.c
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/interface_parser.h
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/parser.c
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/parser.h
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/plugin.c
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/plugin.h
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test-ifupdown.c
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test1
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test11
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test12
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test13
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test14
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test15
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test16
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test2
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test3
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test4
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test5
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test6
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test7
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test8
  soc2011/kulakov_ad/src/settings/plugins/ifupdown/tests/test9
  soc2011/kulakov_ad/src/settings/plugins/keyfile/
  soc2011/kulakov_ad/src/settings/plugins/keyfile/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/keyfile/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/keyfile/common.h
  soc2011/kulakov_ad/src/settings/plugins/keyfile/errors.c
  soc2011/kulakov_ad/src/settings/plugins/keyfile/nm-keyfile-connection.c
  soc2011/kulakov_ad/src/settings/plugins/keyfile/nm-keyfile-connection.h
  soc2011/kulakov_ad/src/settings/plugins/keyfile/plugin.c
  soc2011/kulakov_ad/src/settings/plugins/keyfile/plugin.h
  soc2011/kulakov_ad/src/settings/plugins/keyfile/reader.c
  soc2011/kulakov_ad/src/settings/plugins/keyfile/reader.h
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
  soc2011/kulakov_ad/src/settings/plugins/keyfile/tests/test-keyfile.c
  soc2011/kulakov_ad/src/settings/plugins/keyfile/utils.c
  soc2011/kulakov_ad/src/settings/plugins/keyfile/utils.h
  soc2011/kulakov_ad/src/settings/plugins/keyfile/writer.c
  soc2011/kulakov_ad/src/settings/plugins/keyfile/writer.h
  soc2011/kulakov_ad/src/settings/tests/
  soc2011/kulakov_ad/src/settings/tests/Makefile.am
  soc2011/kulakov_ad/src/settings/tests/Makefile.in
  soc2011/kulakov_ad/src/settings/tests/test-wired-defname.c
  soc2011/kulakov_ad/src/supplicant-manager/
  soc2011/kulakov_ad/src/supplicant-manager/Makefile.am
  soc2011/kulakov_ad/src/supplicant-manager/Makefile.in
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-config.c
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-config.h
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-interface.c
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-interface.h
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-manager.c
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-manager.h
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-settings-verify.c
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-settings-verify.h
  soc2011/kulakov_ad/src/supplicant-manager/nm-supplicant-types.h
  soc2011/kulakov_ad/src/supplicant-manager/tests/
  soc2011/kulakov_ad/src/supplicant-manager/tests/Makefile.am
  soc2011/kulakov_ad/src/supplicant-manager/tests/Makefile.in
  soc2011/kulakov_ad/src/supplicant-manager/tests/test-supplicant-config.c
  soc2011/kulakov_ad/src/tests/
  soc2011/kulakov_ad/src/tests/Makefile.am
  soc2011/kulakov_ad/src/tests/Makefile.in
  soc2011/kulakov_ad/src/tests/test-dhcp-options.c
  soc2011/kulakov_ad/src/tests/test-policy-hosts.c
  soc2011/kulakov_ad/src/tests/test-secret-agent.py   (contents, props changed)
  soc2011/kulakov_ad/src/tests/test-wifi-ap-utils.c
  soc2011/kulakov_ad/src/vpn-manager/
  soc2011/kulakov_ad/src/vpn-manager/Makefile.am
  soc2011/kulakov_ad/src/vpn-manager/Makefile.in
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-connection-base.c
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-connection-base.h
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-connection.c
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-connection.h
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-manager.c
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-manager.h
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-service.c
  soc2011/kulakov_ad/src/vpn-manager/nm-vpn-service.h
  soc2011/kulakov_ad/src/wimax/
  soc2011/kulakov_ad/src/wimax/Makefile.am
  soc2011/kulakov_ad/src/wimax/Makefile.in
  soc2011/kulakov_ad/src/wimax/iwmxsdk.c
  soc2011/kulakov_ad/src/wimax/iwmxsdk.h
  soc2011/kulakov_ad/src/wimax/nm-device-wimax.c
  soc2011/kulakov_ad/src/wimax/nm-device-wimax.h
  soc2011/kulakov_ad/src/wimax/nm-wimax-nsp.c
  soc2011/kulakov_ad/src/wimax/nm-wimax-nsp.h
  soc2011/kulakov_ad/src/wimax/nm-wimax-types.h
  soc2011/kulakov_ad/src/wimax/nm-wimax-util.c
  soc2011/kulakov_ad/src/wimax/nm-wimax-util.h
  soc2011/kulakov_ad/src/wpa.c
  soc2011/kulakov_ad/src/wpa.h
  soc2011/kulakov_ad/test/
  soc2011/kulakov_ad/test/Makefile.am
  soc2011/kulakov_ad/test/Makefile.in
  soc2011/kulakov_ad/test/libnm-glib-test.c
  soc2011/kulakov_ad/test/nm-online.c
  soc2011/kulakov_ad/test/nm-tool.c
  soc2011/kulakov_ad/tools/
  soc2011/kulakov_ad/tools/Makefile.am
  soc2011/kulakov_ad/tools/Makefile.in
  soc2011/kulakov_ad/tools/check-exports.sh   (contents, props changed)
  soc2011/kulakov_ad/tools/doc-generator.xsl

Added: soc2011/kulakov_ad/ABOUT-NLS
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/kulakov_ad/ABOUT-NLS	Mon Jun  6 17:10:41 2011	(r222895)
@@ -0,0 +1,1068 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://translationproject.org/', in the "Teams" area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `coordinator@translationproject.org' to
+reach the coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of November
+2007.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
+                        +----------------------------------------------------+
+     Compendium         |                      []       [] []        []      |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
+     ap-utils           |                                                    |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                                                 [] |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                                                    |
+     bison              |                               [] []                |
+     bison-runtime      |                                  []                |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                               [] []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    [] []       []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     dialog             |                                                    |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []     []      |
+     findutils          |                []                                  |
+     findutils_stable   |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                                    |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gcal               |                      []                            |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gip                |                []                                  |
+     gliv               |                []                []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                      [] []       () ()     []      |
+     gnuedu             |                                                    |
+     gnulib             |                []                                  |
+     gnunet             |                                                    |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                  []                |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
+     gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                                    |
+     gramadoir          | []                               []                |
+     grep               |                         []                      [] |
+     gretl              |                                  ()                |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins-bad    |                []             []                   |
+     gst-plugins-base   |                []             []                   |
+     gst-plugins-good   |                []    []       []                   |
+     gst-plugins-ugly   |                []             []                   |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |             []          []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     herrie             |                                  []                |
+     hylafax            |                                                    |
+     idutils            |                               [] []                |
+     indent             |                      [] []       []             [] |
+     iso_15924          |                                                    |
+     iso_3166           |       []    [] [] [] [] [] [] [] [] []          [] |
+     iso_3166_2         |                                                    |
+     iso_4217           |                         []    [] []                |
+     iso_639            |                         []    [] []             [] |
+     jpilot             |                         []                         |
+     jtag               |                                                    |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                      []          []                |
+     keytouch-editor    |                                  []                |
+     keytouch-keyboa... |                      []                            |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] []                |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                         []    []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
+     lingoteach         |                                                    |
+     lprng              |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailfromd          |                                                    |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      []       [] []                |
+     minicom            |                         []    [] []                |
+     nano               |                []    []          []                |
+     opcodes            |                                  []                |
+     parted             |                         []       []                |
+     pilot-qof          |                                                    |
+     popt               |                         []    [] []                |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                               []                   |
+     screem             |                                                    |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     shared-mime-info   |                []    [] []    [] () []     []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     skencil            |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                []                |
+     texinfo            |                               [] []             [] |
+     tin                |                                  ()        ()      |
+     tuxpaint           | []             []             [] []        []   [] |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] []    [] []                |
+     util-linux-ng      |                      [] []    [] []                |
+     vorbis-tools       |                         []                         |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      [] []       []                |
+     xchat              |             [] []    [] []       [] []     []      |
+     xkeyboard-config   |                []                                  |
+     xpad               |                []             []           []      |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                           6  0  2  1  8 26  2 40 48  2 56 88 15  1  15   18
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     Compendium         | []          [] []  []                []          |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []                                               |
+     bfd                | []          []                                   |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     dialog             |       []           []                         [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     fetchmail          | []                                               |
+     findutils          |    []              []                []          |
+     findutils_stable   |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                                                  |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                () |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []          [] []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []    []       []                             [] |
+     gip                | []    []       []  []                            |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnuedu             | []                                               |
+     gnulib             | [] []              []                            |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []          [] []  []                   []       |
+     gpsdrive           |    []                                            |
+     gramadoir          |                []  []                            |
+     grep               | []          []     []                            |
+     gretl              | []    []       []                             () |
+     gsasl              |                    []                   []       |
+     gss                |                []  []                            |
+     gst-plugins-bad    | []          []                       []       [] |
+     gst-plugins-base   | []          []                       []       [] |
+     gst-plugins-good   | []    []    []                       []       [] |
+     gst-plugins-ugly   | []          []                       []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |             []     []                         [] |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                []       [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     herrie             |                    []                            |
+     hylafax            |                                                  |
+     idutils            |                []  []                [] []    [] |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_15924          |                []                                |
+     iso_3166           | [] [] []    [] []     [] [] [] [] [] [] []    [] |
+     iso_3166_2         |                []                                |
+     iso_4217           | [] []       [] []                    []       [] |
+     iso_639            | []       [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                []  []                         [] |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                         [] |
+     latrine            |                    []                         [] |
+     ld                 | []          [] []  []                            |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                []                                |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []       []     []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           | []          [] []                                |
+     lingoteach         |                []                       []    [] |
+     lprng              |                                                  |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailfromd          |                                                  |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             |                                               [] |
+     minicom            | []          [] []                    []          |
+     nano               | []    []       []  [] []             []       [] |
+     opcodes            | []          [] []  []                            |
+     parted             |                []                       []    [] |
+     pilot-qof          |                                                  |
+     popt               |                []  [] []                   []    |
+     psmisc             |                                      []       [] |
+     pwdutils           |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                []                                |
+     skencil            | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     system-tools-ba... | []    []    [] []  []             [] [] []    [] |
+     tar                |    [] []    []     []                []          |
+     texinfo            |                []           []       []          |
+     tin                |    []          ()                                |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     util-linux-ng      | [] []       [] []                    [] []    [] |
+     vorbis-tools       |                                                  |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []          [] []        []    []    []       [] |
+     xkeyboard-config   | []          [] []                    []          |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          85 22 14  2 48 101 61 12  2  8  2  6 53 29  1 52
+
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                        +--------------------------------------------------+
+     Compendium         |                                           []     |
+     a2ps               |       ()                      []          []     |
+     aegis              |                                           ()     |
+     ant-phone          |                                           []     |
+     anubis             |                               []    []    []     |
+     ap-utils           |                               []                 |
+     aspell             |                            []             []     |
+     bash               |                                           []     |
+     bfd                |                                                  |
+     bibshelf           |                               []                 |
+     binutils           |                                                  |
+     bison              |                               []    []    []     |
+     bison-runtime      |                               []    []    []     |
+     bluez-pin          |          []                   []          []     |
+     cflow              |                                                  |
+     clisp              |                                           []     |
+     console-tools      |                                                  |
+     coreutils          |                                           []     |
+     cpio               |                                           []     |
+     cpplib             |                                           []     |
+     cryptonit          |                                           []     |
+     dialog             |                               []          []     |
+     diffutils          | []                            []          []     |
+     doodle             |                                                  |
+     e2fsprogs          |                                           []     |
+     enscript           |                                           []     |
+     fetchmail          | []                                        []     |
+     findutils          |                                           []     |
+     findutils_stable   |                                           []     |
+     flex               |       []                                  []     |
+     fslint             |                                                  |
+     gas                |                                                  |
+     gawk               | []                                        []     |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | []                            []          []     |
+     gettext-runtime    | []    []                                  []     |
+     gettext-tools      | []    []                                         |
+     gip                |                               []          []     |
+     gliv               |                                           []     |
+     glunarclock        |                               []          []     |
+     gmult              | []                            []          []     |
+     gnubiff            |                                                  |
+     gnucash            | ()                                  () ()        |
+     gnuedu             |                                                  |
+     gnulib             | []                                        []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                               []                 |
+     gpe-aerial         |                                           []     |
+     gpe-beam           |                                           []     |
+     gpe-calendar       | []                                               |
+     gpe-clock          | []    []                                  []     |
+     gpe-conf           | []    []                                  []     |
+     gpe-contacts       |       []                                         |
+     gpe-edit           | []    []                                  []     |
+     gpe-filemanager    | []    []                                         |
+     gpe-go             | []    []                                  []     |
+     gpe-login          | []    []                                  []     |
+     gpe-ownerinfo      | []                                        []     |
+     gpe-package        | []    []                                         |
+     gpe-sketchbook     |       []                                  []     |
+     gpe-su             | []    []                                  []     |
+     gpe-taskmanager    | []    [] []                               []     |
+     gpe-timesheet      |                                           []     |
+     gpe-today          | []                                        []     |
+     gpe-todo           | []                                               |
+     gphoto2            | []                                        []     |
+     gprof              |                               []                 |
+     gpsdrive           |                                           []     |
+     gramadoir          |                                           ()     |
+     grep               |             []                            []     |
+     gretl              |                                                  |
+     gsasl              |                                           []     |
+     gss                |                                                  |
+     gst-plugins-bad    |                                           []     |
+     gst-plugins-base   |                                           []     |
+     gst-plugins-good   |                                           []     |
+     gst-plugins-ugly   |                                           []     |
+     gstreamer          |                                           []     |
+     gtick              |                                           []     |
+     gtkam              | []                                        []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |                            []             []     |
+     gutenprint         |                                           []     |
+     hello              | [] [] []                      []    []    []  [] |
+     herrie             |                                           []     |
+     hylafax            |                                                  |
+     idutils            |                                           []     |
+     indent             | []                                        []     |
+     iso_15924          |                                           []     |
+     iso_3166           | []    [] []       []    []          []    []  [] |
+     iso_3166_2         |                                           []     |
+     iso_4217           | []                []                      []     |
+     iso_639            | []                []                      []  [] |
+     jpilot             | ()                                        ()     |
+     jtag               |                                                  |
+     jwhois             |                                           []     |
+     kbd                |                                           []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                                  |
+     latrine            |                                           []     |
+     ld                 |                                                  |
+     leafpad            | []                []                             |
+     libc               | []    []                                  []     |
+     libexif            |                                                  |
+     libextractor       |                                                  |
+     libgpewidget       |                                           []     |
+     libgpg-error       |                                                  |
+     libgphoto2         | []                                               |
+     libgphoto2_port    | []                                               |
+     libgsasl           |                                           []     |
+     libiconv           |                                           []     |
+     libidn             | []                                        []     |
+     lifelines          |                                           []     |
+     lilypond           |                                           []     |
+     lingoteach         |                                           []     |
+     lprng              |                                                  |
+     lynx               | []                                        []     |
+     m4                 | []                                        []     |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               | []    []                                  []     |
+     man-db             |                                                  |
+     minicom            | []                                               |
+     nano               |                               []    []    []     |
+     opcodes            |                                           []     |
+     parted             | []                                        []     |
+     pilot-qof          |                                                  |
+     popt               | []    []                                  []     |
+     psmisc             | []                                  []    []     |
+     pwdutils           |                                                  |
+     qof                |                                                  |
+     radius             |                                                  |
+     recode             |                                           []     |
+     rpm                | []    []                                         |
+     screem             | []                                               |
+     scrollkeeper       |                                     [] [] []  [] |
+     sed                | []                                        []     |
+     shared-mime-info   | []    []          []          []    []    []  [] |
+     sharutils          | []                                        []     |
+     shishi             |                                                  |
+     skencil            |                                                  |
+     solfege            |                                     ()        () |
+     soundtracker       |                                                  |
+     sp                 | ()                                               |
+     system-tools-ba... | []    []          []                      []     |
+     tar                | []          []                            []     |
+     texinfo            |                                     []    []     |
+     tin                |                                                  |
+     tuxpaint           |                                     ()    []  [] |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | []                                        []     |
+     util-linux-ng      | []                                        []     |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                           []     |
+     wdiff              |                               []    []           |
+     wget               | []                                        []     |
+     xchat              | []    []                []                []     |
+     xkeyboard-config   |    [] []                                  []     |
+     xpad               |       []                      []          []     |
+                        +--------------------------------------------------+
+                          ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl  nn
+                          51  2 25  3  2  0  6  0  2  2 20  0 11  1 103  6
+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +--------------------------------------------------+
+     Compendium         |          []  []      []       []          []     |
+     a2ps               |       ()     []      [] []       []    [] []     |
+     aegis              |                      () ()                       |
+     ant-phone          |                      []                   []     |
+     anubis             |       []             [] []                       |
+     ap-utils           |       ()                                         |
+     aspell             |                      [] []    []                 |
+     bash               |       []                      []                 |
+     bfd                |                                                  |
+     bibshelf           |                                           []     |
+     binutils           |                         []    []                 |
+     bison              |       []     []      [] []                []     |
+     bison-runtime      |       []     []      []          []       []     |
+     bluez-pin          |       []     []   [] [] []    [] []    [] []     |
+     cflow              |       []                                         |
+     clisp              |                         []                       |
+     console-tools      |                         []                       |
+     coreutils          |       []                []       []       []     |
+     cpio               |       []                []                []     |
+     cpplib             |                                           []     |
+     cryptonit          |              []                           []     |
+     dialog             |                                           []     |
+     diffutils          |       []     []      [] []             [] []     |
+     doodle             |                                     []    []     |
+     e2fsprogs          |       []                                  []     |
+     enscript           |              []      [] []       []       []     |
+     fetchmail          |       []                []          []           |
+     findutils          |       [] []                               []     |
+     findutils_stable   |       [] []          []       [] []       []     |
+     flex               |       []     []      [] []                []     |
+     fslint             |                                           []     |
+     gas                |                                                  |
+     gawk               |       []     []      []                   []     |
+     gcal               |                                           []     |
+     gcc                |                                        [] []     |
+     gettext-examples   |       [] []          [] []    [] []    [] []     |
+     gettext-runtime    |       [] []          [] []    [] []    [] []     |
+     gettext-tools      |       []             [] []    [] []    [] []     |
+     gip                |                   []          []       [] []     |
+     gliv               |       []     []      [] []    []          []     |
+     glunarclock        |              []      [] []    []       [] []     |
+     gmult              |                   [] []                [] []     |
+     gnubiff            |                      ()                   []     |
+     gnucash            |       ()                                  []     |
+     gnuedu             |                                                  |
+     gnulib             |       []                         []       []     |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                           []     |
+     gnutls             |       []                                  []     |
+     gpe-aerial         |          []  []      [] []       []    [] []     |
+     gpe-beam           |          []  []      [] []       []    [] []     |
+     gpe-calendar       |                         []       []    [] []     |
+     gpe-clock          |          []  []      [] []    [] []    [] []     |
+     gpe-conf           |          []  []      [] []    [] []       []     |
+     gpe-contacts       |                      [] []       []    [] []     |
+     gpe-edit           |       [] []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                  []       []     |
+     gpe-go             |       []     []      [] []    [] []    [] []     |
+     gpe-login          |          []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |          []  []      [] []    [] []    [] []     |
+     gpe-package        |                                  []       []     |
+     gpe-sketchbook     |          []  []      [] []    [] []    [] []     |
+     gpe-su             |          []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |          []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |          []  []      [] []    [] []    [] []     |
+     gpe-today          |          []  []      [] []    [] []    [] []     |
+     gpe-todo           |                         []       []    [] []     |
+     gphoto2            |    [] []             []       []       [] []     |
+     gprof              |              []      []                   []     |
+     gpsdrive           |                         []                []     |
+     gramadoir          |                               []          []     |
+     grep               |       []                      [] []       []     |
+     gretl              |       [] []  []                                  |
+     gsasl              |       []                               [] []     |
+     gss                |       []             []       []          []     |
+     gst-plugins-bad    |       []     []                           []     |
+     gst-plugins-base   |       []                                  []     |
+     gst-plugins-good   |       []                                  []     |
+     gst-plugins-ugly   |       []     []                           []     |
+     gstreamer          |       []                            [] [] []     |
+     gtick              |                         []                       |
+     gtkam              |    [] []     []         []                []     |
+     gtkorphan          |                                           []     |
+     gtkspell           |              []   [] [] []    [] []    [] []     |
+     gutenprint         |                                           []     |
+     hello              |       []     []      [] []    [] []    [] []     |
+     herrie             |       []                []                []     |
+     hylafax            |                                                  |
+     idutils            |       []     []      [] []                []     |
+     indent             |       []     []      [] []    []       [] []     |
+     iso_15924          |                                                  |
+     iso_3166           |    [] [] []  []      [] [] [] [] [] [] [] []  [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |       [] []             [] []    []    [] []     |
+     iso_639            |       []                [] [] [] []    [] []     |
+     jpilot             |                                                  |
+     jtag               |                               []                 |
+     jwhois             |       []     []      []                   []     |
+     kbd                |       []             []                   []     |
+     keytouch           |                                           []     |
+     keytouch-editor    |                                           []     |
+     keytouch-keyboa... |                                           []     |
+     latrine            |                                                  |
+     ld                 |                                           []     |
+     leafpad            |       [] []             []    []          []  [] |
+     libc               |       []                []    []          []     |
+     libexif            |       []                      []                 |
+     libextractor       |                      []                   []     |
+     libgpewidget       |       [] []  []      []       [] []    [] []     |
+     libgpg-error       |       []             []                   []     |
+     libgphoto2         |       []                                         |
+     libgphoto2_port    |       []                []                []     |
+     libgsasl           |       []             []                [] []     |
+     libiconv           |                                  []    [] []     |
+     libidn             |       []                               [] ()     |
+     lifelines          |       []                                  []     |
+     lilypond           |                                                  |
+     lingoteach         |              []                                  |
+     lprng              |       []                                         |
+     lynx               |              []         []                []     |
+     m4                 |       []     []      [] []                []     |
+     mailfromd          |       []                                         |
+     mailutils          |       []                []                []     |
+     make               |       []     []         []                []     |
+     man-db             |       []             [] []                []     |
+     minicom            |       []     []      [] []                []     |
+     nano               |              []      [] []                []     |
+     opcodes            |                      []                   []     |
+     parted             |       []                                         |
+     pilot-qof          |                                                  |
+     popt               |       [] []             []                []     |
+     psmisc             |       []                                  []     |
+     pwdutils           |       []                                  []     |
+     qof                |              []                           []     |
+     radius             |       []                []                       |
+     recode             |       [] []  []      [] []       []       []     |
+     rpm                |       [] []             []                []     |
+     screem             |                                                  |
+     scrollkeeper       |       []             [] []    []    [] [] []     |
+     sed                |       [] []  []      [] []    [] []    [] []     |
+     shared-mime-info   |       [] []  []                     [] [] []     |
+     sharutils          |       []                []             [] []     |
+     shishi             |       []                                         |
+     skencil            |          []  []                           []     |
+     solfege            |              []                                  |
+     soundtracker       |                               []          []     |
+     sp                 |                                                  |
+     system-tools-ba... |    [] [] []  []      []             [] [] []  [] |
+     tar                |       []                []       []       []     |
+     texinfo            |       []             [] []                []     |
+     tin                |                         ()                       |
+     tuxpaint           |       [] []                      [] [] [] []     |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         |              []         []       []       []     |
+     util-linux-ng      |              []         []       []       []     |
+     vorbis-tools       |                         []                       |
+     wastesedge         |                                                  |
+     wdiff              |       []     []      [] []    [] []       []     |
+     wget               |          []             []    []          []     |
+     xchat              |    []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                               [] []       []     |
+     xpad               |                               [] []       []     |
+                        +--------------------------------------------------+
+                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0  5 77 31  53    4 58 72  3 45 46  9 45 122  3
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     Compendium         |          []        []         []          []      | 19
+     a2ps               |          [] []     []                             | 19
+     aegis              |                    []                             |  1
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 16
+     bash               |          []                                       |  6
+     bfd                |                                                   |  2
+     bibshelf           |                    []                             |  7
+     binutils           |          [] []     []                     []      |  9
+     bison              |          [] []     []                     []      | 20
+     bison-runtime      |             []     []         []          []      | 18
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  9
+     console-tools      |          []        []                             |  5
+     coreutils          |          [] []     []                             | 18
+     cpio               |          [] []     []         []                  | 11
+     cpplib             |          [] []     []         []          []      | 12
+     cryptonit          |                    []                             |  6
+     dialog             |                    []  []     []                  |  9
+     diffutils          |          [] []     []         []          []      | 29
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     fetchmail          |          []        []                             | 12
+     findutils          |          [] []     []                             | 11
+     findutils_stable   |          [] []     []                     []      | 18
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  2
+     gas                |          []                                       |  3
+     gawk               |          []        []         []                  | 16
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  7
+     gettext-examples   |          [] []     []         []    []    []      | 29
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 20
+     gip                |                    []                     []      | 13
+     gliv               |          []        []                             | 11
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 16
+     gnubiff            |                    []                             |  2
+     gnucash            |          () []                                    |  5
+     gnuedu             |                    []                             |  2
+     gnulib             |                    []                             | 10
+     gnunet             |                                                   |  0
+     gnunet-gtk         |          []        []                             |  3
+     gnutls             |                                                   |  4
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []  []                         |  7
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []  []     []                  | 16
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []     []          []      | 22
+     gpe-filemanager    |                    []  []                         |  7
+     gpe-go             |          []        []  []     []                  | 19
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []  []     []                  | 21
+     gpe-taskmanager    |          []        []  []     []                  | 21
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []  []                         |  8
+     gphoto2            |             []     []         []          []      | 21
+     gprof              |          []        []                             | 13
+     gpsdrive           |                    []                             |  5
+     gramadoir          |                    []                             |  7
+     grep               |                    []                             | 12
+     gretl              |                                                   |  6
+     gsasl              |                    []         []          []      |  9
+     gss                |                    []                             |  7
+     gst-plugins-bad    |             []     []         []                  | 13
+     gst-plugins-base   |             []     []                             | 11
+     gst-plugins-good   |             []     []         []    []    []      | 16
+     gst-plugins-ugly   |             []     []         []                  | 13
+     gstreamer          |          [] []     []                             | 18
+     gtick              |             []     []                             |  7
+     gtkam              |                    []                             | 16
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 27
+     gutenprint         |                                                   |  4
+     hello              |          [] []     []         []          []      | 38
+     herrie             |          []        []                             |  8
+     hylafax            |                                                   |  0
+     idutils            |          []        []                             | 15
+     indent             |          [] []     []         []          []      | 28
+     iso_15924          |                    []         []                  |  4
+     iso_3166           |    [] [] [] []     []  []     []    []    []      | 54
+     iso_3166_2         |                    []         []                  |  4
+     iso_4217           |    []    []        []         []    []            | 24
+     iso_639            |             []     []  []     []    []            | 26
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          [] []     []                             | 13
+     keytouch           |                    []                             |  8
+     keytouch-editor    |                    []                             |  5
+     keytouch-keyboa... |                    []                             |  5
+     latrine            |          []        []                             |  5
+     ld                 |          []        []         []          []      | 10
+     leafpad            |          [] []     []         []          []      | 24
+     libc               |          []                   []          []      | 19
+     libexif            |                    []                             |  5
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 20
+     libgpg-error       |                    []                             |  6
+     libgphoto2         |             []     []                             |  9
+     libgphoto2_port    |             []     []                     []      | 11
+     libgsasl           |                    []                             |  8
+     libiconv           |                    []  []                         | 11
+     libidn             |                    []         []                  | 11
+     lifelines          |                                                   |  4
+     lilypond           |                    []                             |  6
+     lingoteach         |                    []                             |  6
+     lprng              |                    []                             |  2
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailfromd          |             []     []                             |  3
+     mailutils          |             []     []                             |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  9
+     minicom            |                    []                             | 14
+     nano               |                    []         []          []      | 20
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      | 11
+     pilot-qof          |                    []                             |  1
+     popt               |          []        []         []          []      | 18

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 15:49:59 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 40AA4106564A
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 15:49:57 +0000 (UTC)
	(envelope-from rudot@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 15:49:57 +0000
Date: Fri, 10 Jun 2011 15:49:57 +0000
From: rudot@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610154957.40AA4106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223064 - in soc2011/rudot: kern sys
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 15:49:59 -0000

Author: rudot
Date: Fri Jun 10 15:49:56 2011
New Revision: 223064
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223064

Log:
  Standalone scheduler
  changed mapping of priorities to queues

Added:
  soc2011/rudot/kern/kern_switch.c
  soc2011/rudot/kern/sched_fbfs.c
     - copied, changed from r222402, soc2011/rudot/kern/sched_4bsd.c
  soc2011/rudot/sys/
  soc2011/rudot/sys/runq.h
Deleted:
  soc2011/rudot/kern/proc.h
  soc2011/rudot/kern/sched_4bsd.c

Added: soc2011/rudot/kern/kern_switch.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/rudot/kern/kern_switch.c	Fri Jun 10 15:49:56 2011	(r223064)
@@ -0,0 +1,523 @@
+/*-
+ * Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ */
+
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.146.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $");
+
+#include "opt_sched.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kdb.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/sched.h>
+#include <sys/smp.h>
+#include <sys/sysctl.h>
+
+#include <machine/cpu.h>
+
+/* Uncomment this to enable logging of critical_enter/exit. */
+#if 0
+#define	KTR_CRITICAL	KTR_SCHED
+#else
+#define	KTR_CRITICAL	0
+#endif
+
+#ifdef FULL_PREEMPTION
+#ifndef PREEMPTION
+#error "The FULL_PREEMPTION option requires the PREEMPTION option"
+#endif
+#endif
+
+CTASSERT((RQB_BPW * RQB_LEN) == RQ_NQS);
+
+/*
+ * kern.sched.preemption allows user space to determine if preemption support
+ * is compiled in or not.  It is not currently a boot or runtime flag that
+ * can be changed.
+ */
+#ifdef PREEMPTION
+static int kern_sched_preemption = 1;
+#else
+static int kern_sched_preemption = 0;
+#endif
+SYSCTL_INT(_kern_sched, OID_AUTO, preemption, CTLFLAG_RD,
+    &kern_sched_preemption, 0, "Kernel preemption enabled");
+
+/*
+ * Support for scheduler stats exported via kern.sched.stats.  All stats may
+ * be reset with kern.sched.stats.reset = 1.  Stats may be defined elsewhere
+ * with SCHED_STAT_DEFINE().
+ */
+#ifdef SCHED_STATS
+SYSCTL_NODE(_kern_sched, OID_AUTO, stats, CTLFLAG_RW, 0, "switch stats");
+
+/* Switch reasons from mi_switch(). */
+DPCPU_DEFINE(long, sched_switch_stats[SWT_COUNT]);
+SCHED_STAT_DEFINE_VAR(uncategorized,
+    &DPCPU_NAME(sched_switch_stats[SWT_NONE]), "");
+SCHED_STAT_DEFINE_VAR(preempt,
+    &DPCPU_NAME(sched_switch_stats[SWT_PREEMPT]), "");
+SCHED_STAT_DEFINE_VAR(owepreempt,
+    &DPCPU_NAME(sched_switch_stats[SWT_OWEPREEMPT]), "");
+SCHED_STAT_DEFINE_VAR(turnstile,
+    &DPCPU_NAME(sched_switch_stats[SWT_TURNSTILE]), "");
+SCHED_STAT_DEFINE_VAR(sleepq,
+    &DPCPU_NAME(sched_switch_stats[SWT_SLEEPQ]), "");
+SCHED_STAT_DEFINE_VAR(sleepqtimo,
+    &DPCPU_NAME(sched_switch_stats[SWT_SLEEPQTIMO]), "");
+SCHED_STAT_DEFINE_VAR(relinquish, 
+    &DPCPU_NAME(sched_switch_stats[SWT_RELINQUISH]), "");
+SCHED_STAT_DEFINE_VAR(needresched,
+    &DPCPU_NAME(sched_switch_stats[SWT_NEEDRESCHED]), "");
+SCHED_STAT_DEFINE_VAR(idle, 
+    &DPCPU_NAME(sched_switch_stats[SWT_IDLE]), "");
+SCHED_STAT_DEFINE_VAR(iwait,
+    &DPCPU_NAME(sched_switch_stats[SWT_IWAIT]), "");
+SCHED_STAT_DEFINE_VAR(suspend,
+    &DPCPU_NAME(sched_switch_stats[SWT_SUSPEND]), "");
+SCHED_STAT_DEFINE_VAR(remotepreempt,
+    &DPCPU_NAME(sched_switch_stats[SWT_REMOTEPREEMPT]), "");
+SCHED_STAT_DEFINE_VAR(remotewakeidle,
+    &DPCPU_NAME(sched_switch_stats[SWT_REMOTEWAKEIDLE]), "");
+
+static int
+sysctl_stats_reset(SYSCTL_HANDLER_ARGS)
+{
+	struct sysctl_oid *p;
+	uintptr_t counter;
+        int error;
+	int val;
+	int i;
+
+        val = 0;
+        error = sysctl_handle_int(oidp, &val, 0, req);
+        if (error != 0 || req->newptr == NULL)
+                return (error);
+        if (val == 0)
+                return (0);
+	/*
+	 * Traverse the list of children of _kern_sched_stats and reset each
+	 * to 0.  Skip the reset entry.
+	 */
+	SLIST_FOREACH(p, oidp->oid_parent, oid_link) {
+		if (p == oidp || p->oid_arg1 == NULL)
+			continue;
+		counter = (uintptr_t)p->oid_arg1;
+		for (i = 0; i <= mp_maxid; i++) {
+			if (CPU_ABSENT(i))
+				continue;
+			*(long *)(dpcpu_off[i] + counter) = 0;
+		}
+	}
+	return (0);
+}
+
+SYSCTL_PROC(_kern_sched_stats, OID_AUTO, reset, CTLTYPE_INT | CTLFLAG_WR, NULL,
+    0, sysctl_stats_reset, "I", "Reset scheduler statistics");
+#endif
+
+/************************************************************************
+ * Functions that manipulate runnability from a thread perspective.	*
+ ************************************************************************/
+/*
+ * Select the thread that will be run next.
+ */
+struct thread *
+choosethread(void)
+{
+	struct thread *td;
+
+retry:
+	td = sched_choose();
+
+	/*
+	 * If we are in panic, only allow system threads,
+	 * plus the one we are running in, to be run.
+	 */
+	if (panicstr && ((td->td_proc->p_flag & P_SYSTEM) == 0 &&
+	    (td->td_flags & TDF_INPANIC) == 0)) {
+		/* note that it is no longer on the run queue */
+		TD_SET_CAN_RUN(td);
+		goto retry;
+	}
+
+	TD_SET_RUNNING(td);
+	return (td);
+}
+
+/*
+ * Kernel thread preemption implementation.  Critical sections mark
+ * regions of code in which preemptions are not allowed.
+ */
+void
+critical_enter(void)
+{
+	struct thread *td;
+
+	td = curthread;
+	td->td_critnest++;
+	CTR4(KTR_CRITICAL, "critical_enter by thread %p (%ld, %s) to %d", td,
+	    (long)td->td_proc->p_pid, td->td_name, td->td_critnest);
+}
+
+void
+critical_exit(void)
+{
+	struct thread *td;
+	int flags;
+
+	td = curthread;
+	KASSERT(td->td_critnest != 0,
+	    ("critical_exit: td_critnest == 0"));
+
+	if (td->td_critnest == 1) {
+		td->td_critnest = 0;
+		if (td->td_owepreempt) {
+			td->td_critnest = 1;
+			thread_lock(td);
+			td->td_critnest--;
+			flags = SW_INVOL | SW_PREEMPT;
+			if (TD_IS_IDLETHREAD(td))
+				flags |= SWT_IDLE;
+			else
+				flags |= SWT_OWEPREEMPT;
+			mi_switch(flags, NULL);
+			thread_unlock(td);
+		}
+	} else
+		td->td_critnest--;
+
+	CTR4(KTR_CRITICAL, "critical_exit by thread %p (%ld, %s) to %d", td,
+	    (long)td->td_proc->p_pid, td->td_name, td->td_critnest);
+}
+
+/************************************************************************
+ * SYSTEM RUN QUEUE manipulations and tests				*
+ ************************************************************************/
+/*
+ * Initialize a run structure.
+ */
+void
+runq_init(struct runq *rq)
+{
+	int i;
+
+	bzero(rq, sizeof *rq);
+	for (i = 0; i < RQ_NQS; i++)
+		TAILQ_INIT(&rq->rq_queues[i]);
+}
+
+/*
+ * Clear the status bit of the queue corresponding to priority level pri,
+ * indicating that it is empty.
+ */
+static __inline void
+runq_clrbit(struct runq *rq, int pri)
+{
+	struct rqbits *rqb;
+
+	rqb = &rq->rq_status;
+	CTR4(KTR_RUNQ, "runq_clrbit: bits=%#x %#x bit=%#x word=%d",
+	    rqb->rqb_bits[RQB_WORD(pri)],
+	    rqb->rqb_bits[RQB_WORD(pri)] & ~RQB_BIT(pri),
+	    RQB_BIT(pri), RQB_WORD(pri));
+	rqb->rqb_bits[RQB_WORD(pri)] &= ~RQB_BIT(pri);
+}
+
+/*
+ * Find the index of the first non-empty run queue.  This is done by
+ * scanning the status bits, a set bit indicates a non-empty queue.
+ */
+static __inline int
+runq_findbit(struct runq *rq)
+{
+	struct rqbits *rqb;
+	int pri;
+	int i;
+
+	rqb = &rq->rq_status;
+	for (i = 0; i < RQB_LEN; i++)
+		if (rqb->rqb_bits[i]) {
+			pri = RQB_FFS(rqb->rqb_bits[i]) + (i << RQB_L2BPW);
+			CTR3(KTR_RUNQ, "runq_findbit: bits=%#x i=%d pri=%d",
+			    rqb->rqb_bits[i], i, pri);
+			return (pri);
+		}
+
+	return (-1);
+}
+
+static __inline int
+runq_findbit_from(struct runq *rq, u_char pri)
+{
+	struct rqbits *rqb;
+	rqb_word_t mask;
+	int i;
+
+	/*
+	 * Set the mask for the first word so we ignore priorities before 'pri'.
+	 */
+	mask = (rqb_word_t)-1 << (pri & (RQB_BPW - 1));
+	rqb = &rq->rq_status;
+again:
+	for (i = RQB_WORD(pri); i < RQB_LEN; mask = -1, i++) {
+		mask = rqb->rqb_bits[i] & mask;
+		if (mask == 0)
+			continue;
+		pri = RQB_FFS(mask) + (i << RQB_L2BPW);
+		CTR3(KTR_RUNQ, "runq_findbit_from: bits=%#x i=%d pri=%d",
+		    mask, i, pri);
+		return (pri);
+	}
+	if (pri == 0)
+		return (-1);
+	/*
+	 * Wrap back around to the beginning of the list just once so we
+	 * scan the whole thing.
+	 */
+	pri = 0;
+	goto again;
+}
+
+/*
+ * Set the status bit of the queue corresponding to priority level pri,
+ * indicating that it is non-empty.
+ */
+static __inline void
+runq_setbit(struct runq *rq, int pri)
+{
+	struct rqbits *rqb;
+
+	rqb = &rq->rq_status;
+	CTR4(KTR_RUNQ, "runq_setbit: bits=%#x %#x bit=%#x word=%d",
+	    rqb->rqb_bits[RQB_WORD(pri)],
+	    rqb->rqb_bits[RQB_WORD(pri)] | RQB_BIT(pri),
+	    RQB_BIT(pri), RQB_WORD(pri));
+	rqb->rqb_bits[RQB_WORD(pri)] |= RQB_BIT(pri);
+}
+
+/*
+ * Add the thread to the queue specified by its priority, and set the
+ * corresponding status bit.
+ */
+void
+runq_add(struct runq *rq, struct thread *td, int flags)
+{
+	struct rqhead *rqh;
+	int pri;
+
+#ifdef SCHED_FBFS
+	if (td->td_priority >= PRI_MIN_IDLE) {
+		pri = RQ_IDLE;
+	} else if (td->td_priority >= PRI_MIN_TIMESHARE) {
+		pri = RQ_TIMESHARE;
+	} else if (td->td_priority >= PRI_MIN_REALTIME) {
+		pri = min(RQ_MIN_REALTIME + td->td_priority - PRI_MIN_REALTIME,
+		    RQ_MAX_REALTIME);
+	} else {
+		pri = td->td_priority / RQ_PPQ;
+	}
+#else
+	pri = td->td_priority / RQ_PPQ;
+#endif
+	
+	td->td_rqindex = pri;
+	runq_setbit(rq, pri);
+	rqh = &rq->rq_queues[pri];
+	CTR4(KTR_RUNQ, "runq_add: td=%p pri=%d %d rqh=%p",
+	    td, td->td_priority, pri, rqh);
+	if (flags & SRQ_PREEMPTED) {
+		TAILQ_INSERT_HEAD(rqh, td, td_runq);
+	} else {
+		TAILQ_INSERT_TAIL(rqh, td, td_runq);
+	}
+}
+
+void
+runq_add_pri(struct runq *rq, struct thread *td, u_char pri, int flags)
+{
+	struct rqhead *rqh;
+
+	KASSERT(pri < RQ_NQS, ("runq_add_pri: %d out of range", pri));
+	td->td_rqindex = pri;
+	runq_setbit(rq, pri);
+	rqh = &rq->rq_queues[pri];
+	CTR4(KTR_RUNQ, "runq_add_pri: td=%p pri=%d idx=%d rqh=%p",
+	    td, td->td_priority, pri, rqh);
+	if (flags & SRQ_PREEMPTED) {
+		TAILQ_INSERT_HEAD(rqh, td, td_runq);
+	} else {
+		TAILQ_INSERT_TAIL(rqh, td, td_runq);
+	}
+}
+/*
+ * Return true if there are runnable processes of any priority on the run
+ * queue, false otherwise.  Has no side effects, does not modify the run
+ * queue structure.
+ */
+int
+runq_check(struct runq *rq)
+{
+	struct rqbits *rqb;
+	int i;
+
+	rqb = &rq->rq_status;
+	for (i = 0; i < RQB_LEN; i++)
+		if (rqb->rqb_bits[i]) {
+			CTR2(KTR_RUNQ, "runq_check: bits=%#x i=%d",
+			    rqb->rqb_bits[i], i);
+			return (1);
+		}
+	CTR0(KTR_RUNQ, "runq_check: empty");
+
+	return (0);
+}
+
+/*
+ * Find the highest priority process on the run queue.
+ */
+struct thread *
+runq_choose_fuzz(struct runq *rq, int fuzz)
+{
+	struct rqhead *rqh;
+	struct thread *td;
+	int pri;
+
+	while ((pri = runq_findbit(rq)) != -1) {
+		rqh = &rq->rq_queues[pri];
+		/* fuzz == 1 is normal.. 0 or less are ignored */
+		if (fuzz > 1) {
+			/*
+			 * In the first couple of entries, check if
+			 * there is one for our CPU as a preference.
+			 */
+			int count = fuzz;
+			int cpu = PCPU_GET(cpuid);
+			struct thread *td2;
+			td2 = td = TAILQ_FIRST(rqh);
+
+			while (count-- && td2) {
+				if (td2->td_lastcpu == cpu) {
+					td = td2;
+					break;
+				}
+				td2 = TAILQ_NEXT(td2, td_runq);
+			}
+		} else
+			td = TAILQ_FIRST(rqh);
+		KASSERT(td != NULL, ("runq_choose_fuzz: no proc on busy queue"));
+		CTR3(KTR_RUNQ,
+		    "runq_choose_fuzz: pri=%d thread=%p rqh=%p", pri, td, rqh);
+		return (td);
+	}
+	CTR1(KTR_RUNQ, "runq_choose_fuzz: idleproc pri=%d", pri);
+
+	return (NULL);
+}
+
+/*
+ * Find the highest priority process on the run queue.
+ */
+struct thread *
+runq_choose(struct runq *rq)
+{
+	struct rqhead *rqh;
+	struct thread *td;
+	int pri;
+
+	while ((pri = runq_findbit(rq)) != -1) {
+		rqh = &rq->rq_queues[pri];
+		td = TAILQ_FIRST(rqh);
+		KASSERT(td != NULL, ("runq_choose: no thread on busy queue"));
+		CTR3(KTR_RUNQ,
+		    "runq_choose: pri=%d thread=%p rqh=%p", pri, td, rqh);
+		return (td);
+	}
+	CTR1(KTR_RUNQ, "runq_choose: idlethread pri=%d", pri);
+
+	return (NULL);
+}
+
+struct thread *
+runq_choose_from(struct runq *rq, u_char idx)
+{
+	struct rqhead *rqh;
+	struct thread *td;
+	int pri;
+
+	if ((pri = runq_findbit_from(rq, idx)) != -1) {
+		rqh = &rq->rq_queues[pri];
+		td = TAILQ_FIRST(rqh);
+		KASSERT(td != NULL, ("runq_choose: no thread on busy queue"));
+		CTR4(KTR_RUNQ,
+		    "runq_choose_from: pri=%d thread=%p idx=%d rqh=%p",
+		    pri, td, td->td_rqindex, rqh);
+		return (td);
+	}
+	CTR1(KTR_RUNQ, "runq_choose_from: idlethread pri=%d", pri);
+
+	return (NULL);
+}
+/*
+ * Remove the thread from the queue specified by its priority, and clear the
+ * corresponding status bit if the queue becomes empty.
+ * Caller must set state afterwards.
+ */
+void
+runq_remove(struct runq *rq, struct thread *td)
+{
+
+	runq_remove_idx(rq, td, NULL);
+}
+
+void
+runq_remove_idx(struct runq *rq, struct thread *td, u_char *idx)
+{
+	struct rqhead *rqh;
+	u_char pri;
+
+	KASSERT(td->td_flags & TDF_INMEM,
+		("runq_remove_idx: thread swapped out"));
+	pri = td->td_rqindex;
+	KASSERT(pri < RQ_NQS, ("runq_remove_idx: Invalid index %d\n", pri));
+	rqh = &rq->rq_queues[pri];
+	CTR4(KTR_RUNQ, "runq_remove_idx: td=%p, pri=%d %d rqh=%p",
+	    td, td->td_priority, pri, rqh);
+	TAILQ_REMOVE(rqh, td, td_runq);
+	if (TAILQ_EMPTY(rqh)) {
+		CTR0(KTR_RUNQ, "runq_remove_idx: empty");
+		runq_clrbit(rq, pri);
+		if (idx != NULL && *idx == pri)
+			*idx = (pri + 1) % RQ_NQS;
+	}
+}

Copied and modified: soc2011/rudot/kern/sched_fbfs.c (from r222402, soc2011/rudot/kern/sched_4bsd.c)
==============================================================================
--- soc2011/rudot/kern/sched_4bsd.c	Thu May 26 13:31:05 2011	(r222402, copy source)
+++ soc2011/rudot/kern/sched_fbfs.c	Fri Jun 10 15:49:56 2011	(r223064)
@@ -229,91 +229,19 @@
 }
 
 /*
- * Constants for digital decay and forget:
- *	90% of (td_estcpu) usage in 5 * loadav time
- *	95% of (ts_pctcpu) usage in 60 seconds (load insensitive)
- *          Note that, as ps(1) mentions, this can let percentages
- *          total over 100% (I've seen 137.9% for 3 processes).
- *
- * Note that schedclock() updates td_estcpu and p_cpticks asynchronously.
- *
- * We wish to decay away 90% of td_estcpu in (5 * loadavg) seconds.
- * That is, the system wants to compute a value of decay such
- * that the following for loop:
- * 	for (i = 0; i < (5 * loadavg); i++)
- * 		td_estcpu *= decay;
- * will compute
- * 	td_estcpu *= 0.1;
- * for all values of loadavg:
- *
- * Mathematically this loop can be expressed by saying:
- * 	decay ** (5 * loadavg) ~= .1
- *
- * The system computes decay as:
- * 	decay = (2 * loadavg) / (2 * loadavg + 1)
- *
- * We wish to prove that the system's computation of decay
- * will always fulfill the equation:
- * 	decay ** (5 * loadavg) ~= .1
- *
- * If we compute b as:
- * 	b = 2 * loadavg
- * then
- * 	decay = b / (b + 1)
- *
- * We now need to prove two things:
- *	1) Given factor ** (5 * loadavg) ~= .1, prove factor == b/(b+1)
- *	2) Given b/(b+1) ** power ~= .1, prove power == (5 * loadavg)
- *
- * Facts:
- *         For x close to zero, exp(x) =~ 1 + x, since
- *              exp(x) = 0! + x**1/1! + x**2/2! + ... .
- *              therefore exp(-1/b) =~ 1 - (1/b) = (b-1)/b.
- *         For x close to zero, ln(1+x) =~ x, since
- *              ln(1+x) = x - x**2/2 + x**3/3 - ...     -1 < x < 1
- *              therefore ln(b/(b+1)) = ln(1 - 1/(b+1)) =~ -1/(b+1).
- *         ln(.1) =~ -2.30
- *
- * Proof of (1):
- *    Solve (factor)**(power) =~ .1 given power (5*loadav):
- *	solving for factor,
- *      ln(factor) =~ (-2.30/5*loadav), or
- *      factor =~ exp(-1/((5/2.30)*loadav)) =~ exp(-1/(2*loadav)) =
- *          exp(-1/b) =~ (b-1)/b =~ b/(b+1).                    QED
- *
- * Proof of (2):
- *    Solve (factor)**(power) =~ .1 given factor == (b/(b+1)):
- *	solving for power,
- *      power*ln(b/(b+1)) =~ -2.30, or
- *      power =~ 2.3 * (b + 1) = 4.6*loadav + 2.3 =~ 5*loadav.  QED
- *
- * Actual power values for the implemented algorithm are as follows:
- *      loadav: 1       2       3       4
- *      power:  5.68    10.32   14.94   19.55
+ * This function is called when a thread is about to be put on run queue
+ * because it has been made runnable or its priority has been adjusted.  It
+ * determines if the new thread should be immediately preempted to.  If so,
+ * it switches to it and eventually returns true.  If not, it returns false
+ * so that the caller may place the thread on an appropriate run queue.
  */
-
-/* calculations for digital decay to forget 90% of usage in 5*loadav sec */
-#define	loadfactor(loadav)	(2 * (loadav))
-#define	decay_cpu(loadfac, cpu)	(((loadfac) * (cpu)) / ((loadfac) + FSCALE))
-
-/* decay 95% of `ts_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */
-static fixpt_t	ccpu = 0.95122942450071400909 * FSCALE;	/* exp(-1/20) */
-SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, "");
-
-/*
- * If `ccpu' is not equal to `exp(-1/20)' and you still want to use the
- * faster/more-accurate formula, you'll have to estimate CCPU_SHIFT below
- * and possibly adjust FSHIFT in "param.h" so that (FSHIFT >= CCPU_SHIFT).
- *
- * To estimate CCPU_SHIFT for exp(-1/20), the following formula was used:
- *	1 - exp(-1/20) ~= 0.0487 ~= 0.0488 == 1 (fixed pt, *11* bits).
- *
- * If you don't want to bother with the faster/more-accurate formula, you
- * can set CCPU_SHIFT to (FSHIFT + 1) which will use a slower/less-accurate
- * (more general) method of calculating the %age of CPU used by a process.
- */
-#define	CCPU_SHIFT	11
-
+int
+maybe_preempt(struct thread *td)
+{
+#ifdef PREEMPTION
+#endif
+	return (0);
+}
 
 /* ARGSUSED */
 static void

Added: soc2011/rudot/sys/runq.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/rudot/sys/runq.h	Fri Jun 10 15:49:56 2011	(r223064)
@@ -0,0 +1,82 @@
+/*-
+ * Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD: src/sys/sys/runq.h,v 1.12.2.1.6.1 2010/12/21 17:09:25 kensmith Exp $
+ */
+
+#ifndef	_RUNQ_H_
+#define	_RUNQ_H_
+
+#include <machine/runq.h>
+
+struct thread;
+
+/*
+ * Run queue parameters.
+ */
+
+#define	RQ_NQS		(64)		/* Number of run queues. */
+#define	RQ_PPQ		(4)		/* Priorities per queue. */
+
+#ifdef SCHED_FBFS
+#define	RQ_IDLE		(RQ_NQS - 1)
+#define	RQ_TIMESHARE	(RQ_IDLE - 1)
+#define RQ_MIN_REALTIME	(PRI_MIN_REALTIME / 4)
+#define RQ_MAX_REALTIME	(RQ_TIMESHARE - 1)
+#endif
+
+/*
+ * Head of run queues.
+ */
+TAILQ_HEAD(rqhead, thread);
+
+/*
+ * Bit array which maintains the status of a run queue.  When a queue is
+ * non-empty the bit corresponding to the queue number will be set.
+ */
+struct rqbits {
+	rqb_word_t rqb_bits[RQB_LEN];
+};
+
+/*
+ * Run queue structure.  Contains an array of run queues on which processes
+ * are placed, and a structure to maintain the status of each queue.
+ */
+struct runq {
+	struct	rqbits rq_status;
+	struct	rqhead rq_queues[RQ_NQS];
+};
+
+void	runq_add(struct runq *, struct thread *, int);
+void	runq_add_pri(struct runq *, struct thread *, u_char, int);
+int	runq_check(struct runq *);
+struct	thread *runq_choose(struct runq *);
+struct	thread *runq_choose_from(struct runq *, u_char);
+struct	thread *runq_choose_fuzz(struct runq *, int);
+void	runq_init(struct runq *);
+void	runq_remove(struct runq *, struct thread *);
+void	runq_remove_idx(struct runq *, struct thread *, u_char *);
+
+#endif

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 16:20:01 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 327021065676
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 16:19:59 +0000 (UTC)
	(envelope-from rudot@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 16:19:59 +0000
Date: Fri, 10 Jun 2011 16:19:59 +0000
From: rudot@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610161959.327021065676@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223065 - in soc2011/rudot: conf kern
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 16:20:01 -0000

Author: rudot
Date: Fri Jun 10 16:19:58 2011
New Revision: 223065
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223065

Log:
  small fix for the top command
  added SCHED_FBSD kernel config option

Added:
  soc2011/rudot/conf/
  soc2011/rudot/conf/files
  soc2011/rudot/conf/options
Modified:
  soc2011/rudot/kern/sched_fbfs.c

Added: soc2011/rudot/conf/files
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2011/rudot/conf/files	Fri Jun 10 16:19:58 2011	(r223065)
@@ -0,0 +1,2984 @@
+# $FreeBSD: src/sys/conf/files,v 1.1459.2.47.2.1 2010/12/21 17:09:25 kensmith Exp $
+#
+# The long compile-with and dependency lines are required because of
+# limitations in config: backslash-newline doesn't work in strings, and
+# dependency lines other than the first are silently ignored.
+#
+acpi_quirks.h			optional acpi				   \
+	dependency	"$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+	compile-with	"${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"acpi_quirks.h"
+aicasm				optional ahc | ahd			   \
+	dependency	"$S/dev/aic7xxx/aicasm/*.[chyl]"		   \
+	compile-with	"CC='${CC}' ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
+	no-obj no-implicit-rule						   \
+	clean		"aicasm* y.tab.h"
+aic7xxx_seq.h			optional ahc				   \
+	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
+	no-obj no-implicit-rule before-depend local			   \
+	clean		"aic7xxx_seq.h"					   \
+	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+aic7xxx_reg.h			optional ahc				   \
+	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
+	no-obj no-implicit-rule before-depend local			   \
+	clean		"aic7xxx_reg.h"					   \
+	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+aic7xxx_reg_print.c		optional ahc				   \
+	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
+	no-obj no-implicit-rule local					   \
+	clean		"aic7xxx_reg_print.c"				   \
+	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+aic7xxx_reg_print.o		optional ahc ahc_reg_pretty_print	   \
+	compile-with	"${NORMAL_C}"					   \
+	no-implicit-rule local
+aic79xx_seq.h		optional ahd pci				   \
+	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
+	no-obj no-implicit-rule before-depend local			   \
+	clean		"aic79xx_seq.h"					   \
+	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+aic79xx_reg.h		optional ahd pci				   \
+	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
+	no-obj no-implicit-rule before-depend local			   \
+	clean		"aic79xx_reg.h"					   \
+	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+aic79xx_reg_print.c	optional ahd pci				   \
+	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
+	no-obj no-implicit-rule local					   \
+	clean		"aic79xx_reg_print.c"				   \
+	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+aic79xx_reg_print.o		optional ahd pci ahd_reg_pretty_print	   \
+	compile-with	"${NORMAL_C}"					   \
+	no-implicit-rule local
+emu10k1-alsa%diked.h		optional snd_emu10k1 | snd_emu10kx	   \
+	dependency	"$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"emu10k1-alsa%diked.h"
+p16v-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"p16v-alsa%diked.h"
+p17v-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"p17v-alsa%diked.h"
+feeder_eq_gen.h			optional sound				   \
+	dependency	"$S/tools/sound/feeder_eq_mkfilter.awk"		   \
+	compile-with	"${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"feeder_eq_gen.h"
+feeder_rate_gen.h		optional sound				   \
+	dependency	"$S/tools/sound/feeder_rate_mkfilter.awk"		   \
+	compile-with	"${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"feeder_rate_gen.h"
+snd_fxdiv_gen.h			optional sound				   \
+	dependency	"$S/tools/sound/snd_fxdiv_gen.awk"			   \
+	compile-with	"${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"snd_fxdiv_gen.h"
+miidevs.h			optional miibus | mii			   \
+	dependency	"$S/tools/miidevs2h.awk $S/dev/mii/miidevs"	   \
+	compile-with	"${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"miidevs.h"
+pccarddevs.h			standard				   \
+	dependency	"$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
+	compile-with	"${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"pccarddevs.h"
+teken_state.h		optional sc					   \
+	dependency	"$S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences" \
+	compile-with	"${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"teken_state.h"
+usbdevs.h			optional usb				   \
+	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
+	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"usbdevs.h"
+usbdevs_data.h			optional usb				   \
+	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
+	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"usbdevs_data.h"
+cam/cam.c			optional scbus
+cam/cam_periph.c		optional scbus
+cam/cam_queue.c			optional scbus
+cam/cam_sim.c			optional scbus
+cam/cam_xpt.c			optional scbus
+cam/ata/ata_all.c		optional scbus
+cam/ata/ata_xpt.c		optional scbus
+cam/ata/ata_pmp.c		optional scbus
+cam/scsi/scsi_xpt.c		optional scbus
+cam/scsi/scsi_all.c		optional scbus
+cam/scsi/scsi_cd.c		optional cd
+cam/scsi/scsi_ch.c		optional ch
+cam/ata/ata_da.c		optional ada | da
+cam/scsi/scsi_da.c		optional da
+cam/scsi/scsi_low.c		optional ct | ncv | nsp | stg
+cam/scsi/scsi_low_pisa.c	optional ct | ncv | nsp | stg
+cam/scsi/scsi_pass.c		optional pass
+cam/scsi/scsi_pt.c		optional pt
+cam/scsi/scsi_sa.c		optional sa
+cam/scsi/scsi_ses.c		optional ses
+cam/scsi/scsi_sg.c		optional sg
+cam/scsi/scsi_targ_bh.c		optional targbh
+cam/scsi/scsi_target.c		optional targ
+contrib/altq/altq/altq_cbq.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_cdnr.c	optional altq
+contrib/altq/altq/altq_hfsc.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_priq.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_red.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_rio.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_rmclass.c optional altq
+contrib/altq/altq/altq_subr.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/dev/acpica/debugger/dbcmds.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbdisply.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbexec.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbfileio.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbhistry.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbinput.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbstats.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbutils.c	optional acpi acpi_debug
+contrib/dev/acpica/debugger/dbxface.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmbuffer.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmnames.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmopcode.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmobject.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmresrc.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmresrcl.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmresrcs.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmutils.c	optional acpi acpi_debug
+contrib/dev/acpica/disassembler/dmwalk.c	optional acpi acpi_debug
+contrib/dev/acpica/dispatcher/dsfield.c		optional acpi
+contrib/dev/acpica/dispatcher/dsinit.c		optional acpi
+contrib/dev/acpica/dispatcher/dsmethod.c	optional acpi
+contrib/dev/acpica/dispatcher/dsmthdat.c	optional acpi
+contrib/dev/acpica/dispatcher/dsobject.c	optional acpi
+contrib/dev/acpica/dispatcher/dsopcode.c	optional acpi
+contrib/dev/acpica/dispatcher/dsutils.c		optional acpi
+contrib/dev/acpica/dispatcher/dswexec.c		optional acpi
+contrib/dev/acpica/dispatcher/dswload.c		optional acpi
+contrib/dev/acpica/dispatcher/dswscope.c	optional acpi
+contrib/dev/acpica/dispatcher/dswstate.c	optional acpi
+contrib/dev/acpica/events/evevent.c		optional acpi
+contrib/dev/acpica/events/evgpe.c		optional acpi
+contrib/dev/acpica/events/evgpeblk.c		optional acpi
+contrib/dev/acpica/events/evgpeinit.c		optional acpi
+contrib/dev/acpica/events/evgpeutil.c		optional acpi
+contrib/dev/acpica/events/evmisc.c		optional acpi
+contrib/dev/acpica/events/evregion.c		optional acpi
+contrib/dev/acpica/events/evrgnini.c		optional acpi
+contrib/dev/acpica/events/evsci.c		optional acpi
+contrib/dev/acpica/events/evxface.c		optional acpi
+contrib/dev/acpica/events/evxfevnt.c		optional acpi
+contrib/dev/acpica/events/evxfregn.c		optional acpi
+contrib/dev/acpica/executer/exconfig.c		optional acpi
+contrib/dev/acpica/executer/exconvrt.c		optional acpi
+contrib/dev/acpica/executer/excreate.c		optional acpi
+contrib/dev/acpica/executer/exdebug.c		optional acpi
+contrib/dev/acpica/executer/exdump.c		optional acpi
+contrib/dev/acpica/executer/exfield.c		optional acpi
+contrib/dev/acpica/executer/exfldio.c		optional acpi
+contrib/dev/acpica/executer/exmisc.c		optional acpi
+contrib/dev/acpica/executer/exmutex.c		optional acpi
+contrib/dev/acpica/executer/exnames.c		optional acpi
+contrib/dev/acpica/executer/exoparg1.c		optional acpi
+contrib/dev/acpica/executer/exoparg2.c		optional acpi
+contrib/dev/acpica/executer/exoparg3.c		optional acpi
+contrib/dev/acpica/executer/exoparg6.c		optional acpi
+contrib/dev/acpica/executer/exprep.c		optional acpi
+contrib/dev/acpica/executer/exregion.c		optional acpi
+contrib/dev/acpica/executer/exresnte.c		optional acpi
+contrib/dev/acpica/executer/exresolv.c		optional acpi
+contrib/dev/acpica/executer/exresop.c		optional acpi
+contrib/dev/acpica/executer/exstore.c		optional acpi
+contrib/dev/acpica/executer/exstoren.c		optional acpi
+contrib/dev/acpica/executer/exstorob.c		optional acpi
+contrib/dev/acpica/executer/exsystem.c		optional acpi
+contrib/dev/acpica/executer/exutils.c		optional acpi
+contrib/dev/acpica/hardware/hwacpi.c		optional acpi
+contrib/dev/acpica/hardware/hwgpe.c		optional acpi
+contrib/dev/acpica/hardware/hwpci.c		optional acpi
+contrib/dev/acpica/hardware/hwregs.c		optional acpi
+contrib/dev/acpica/hardware/hwsleep.c		optional acpi
+contrib/dev/acpica/hardware/hwtimer.c		optional acpi
+contrib/dev/acpica/hardware/hwvalid.c		optional acpi
+contrib/dev/acpica/hardware/hwxface.c		optional acpi
+contrib/dev/acpica/namespace/nsaccess.c		optional acpi
+contrib/dev/acpica/namespace/nsalloc.c		optional acpi
+contrib/dev/acpica/namespace/nsdump.c		optional acpi
+contrib/dev/acpica/namespace/nseval.c		optional acpi
+contrib/dev/acpica/namespace/nsinit.c		optional acpi
+contrib/dev/acpica/namespace/nsload.c		optional acpi
+contrib/dev/acpica/namespace/nsnames.c		optional acpi
+contrib/dev/acpica/namespace/nsobject.c		optional acpi
+contrib/dev/acpica/namespace/nsparse.c		optional acpi
+contrib/dev/acpica/namespace/nspredef.c		optional acpi
+contrib/dev/acpica/namespace/nsrepair.c		optional acpi
+contrib/dev/acpica/namespace/nsrepair2.c	optional acpi
+contrib/dev/acpica/namespace/nssearch.c		optional acpi
+contrib/dev/acpica/namespace/nsutils.c		optional acpi
+contrib/dev/acpica/namespace/nswalk.c		optional acpi
+contrib/dev/acpica/namespace/nsxfeval.c		optional acpi
+contrib/dev/acpica/namespace/nsxfname.c		optional acpi
+contrib/dev/acpica/namespace/nsxfobj.c		optional acpi
+contrib/dev/acpica/parser/psargs.c		optional acpi
+contrib/dev/acpica/parser/psloop.c		optional acpi
+contrib/dev/acpica/parser/psopcode.c		optional acpi
+contrib/dev/acpica/parser/psparse.c		optional acpi
+contrib/dev/acpica/parser/psscope.c		optional acpi
+contrib/dev/acpica/parser/pstree.c		optional acpi
+contrib/dev/acpica/parser/psutils.c		optional acpi
+contrib/dev/acpica/parser/pswalk.c		optional acpi
+contrib/dev/acpica/parser/psxface.c		optional acpi
+contrib/dev/acpica/resources/rsaddr.c		optional acpi
+contrib/dev/acpica/resources/rscalc.c		optional acpi
+contrib/dev/acpica/resources/rscreate.c		optional acpi
+contrib/dev/acpica/resources/rsdump.c		optional acpi
+contrib/dev/acpica/resources/rsinfo.c		optional acpi
+contrib/dev/acpica/resources/rsio.c		optional acpi
+contrib/dev/acpica/resources/rsirq.c		optional acpi
+contrib/dev/acpica/resources/rslist.c		optional acpi
+contrib/dev/acpica/resources/rsmemory.c		optional acpi
+contrib/dev/acpica/resources/rsmisc.c		optional acpi
+contrib/dev/acpica/resources/rsutils.c		optional acpi
+contrib/dev/acpica/resources/rsxface.c		optional acpi
+contrib/dev/acpica/tables/tbfadt.c		optional acpi
+contrib/dev/acpica/tables/tbfind.c		optional acpi
+contrib/dev/acpica/tables/tbinstal.c		optional acpi
+contrib/dev/acpica/tables/tbutils.c		optional acpi
+contrib/dev/acpica/tables/tbxface.c		optional acpi
+contrib/dev/acpica/tables/tbxfroot.c		optional acpi
+contrib/dev/acpica/utilities/utalloc.c		optional acpi
+contrib/dev/acpica/utilities/utcache.c		optional acpi
+contrib/dev/acpica/utilities/utcopy.c		optional acpi
+contrib/dev/acpica/utilities/utdebug.c		optional acpi
+contrib/dev/acpica/utilities/utdelete.c		optional acpi
+contrib/dev/acpica/utilities/uteval.c		optional acpi
+contrib/dev/acpica/utilities/utglobal.c		optional acpi
+contrib/dev/acpica/utilities/utids.c		optional acpi
+contrib/dev/acpica/utilities/utinit.c		optional acpi
+contrib/dev/acpica/utilities/utlock.c		optional acpi
+contrib/dev/acpica/utilities/utmath.c		optional acpi
+contrib/dev/acpica/utilities/utmisc.c		optional acpi
+contrib/dev/acpica/utilities/utmutex.c		optional acpi
+contrib/dev/acpica/utilities/utobject.c		optional acpi
+contrib/dev/acpica/utilities/utosi.c		optional acpi
+contrib/dev/acpica/utilities/utresrc.c		optional acpi
+contrib/dev/acpica/utilities/utstate.c		optional acpi
+contrib/dev/acpica/utilities/utxface.c		optional acpi
+contrib/dev/acpica/utilities/utxferror.c	optional acpi
+contrib/ipfilter/netinet/fil.c	optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_log.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -Wno-error -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/pf/net/if_pflog.c	optional pflog pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/if_pfsync.c	optional pfsync pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf.c		optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_if.c		optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_ioctl.c	optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_norm.c	optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_osfp.c	optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_ruleset.c	optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_subr.c	optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_table.c	optional pf inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/netinet/in4_cksum.c	optional pf inet
+crypto/blowfish/bf_ecb.c	optional ipsec 
+crypto/blowfish/bf_skey.c	optional crypto | ipsec 
+crypto/camellia/camellia.c	optional crypto | ipsec 
+crypto/camellia/camellia-api.c	optional crypto | ipsec 
+crypto/des/des_ecb.c		optional crypto | ipsec | netsmb
+crypto/des/des_setkey.c		optional crypto | ipsec | netsmb
+crypto/rc4/rc4.c		optional netgraph_mppc_encryption | kgssapi
+crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
+					 ipsec | random | wlan_ccmp
+crypto/rijndael/rijndael-api-fst.c optional geom_bde | random
+crypto/rijndael/rijndael-api.c	optional crypto | ipsec | wlan_ccmp
+crypto/sha1.c			optional carp | crypto | ipsec | \
+					 netgraph_mppc_encryption | sctp
+crypto/sha2/sha2.c		optional crypto | geom_bde | ipsec | random | \
+					 sctp
+ddb/db_access.c			optional	ddb
+ddb/db_break.c			optional	ddb
+ddb/db_capture.c		optional	ddb
+ddb/db_command.c		optional	ddb
+ddb/db_examine.c		optional	ddb
+ddb/db_expr.c			optional	ddb
+ddb/db_input.c			optional	ddb
+ddb/db_lex.c			optional	ddb
+ddb/db_main.c			optional	ddb
+ddb/db_output.c			optional	ddb
+ddb/db_print.c			optional	ddb
+ddb/db_ps.c			optional	ddb
+ddb/db_run.c			optional	ddb
+ddb/db_script.c			optional	ddb
+ddb/db_sym.c			optional	ddb
+ddb/db_thread.c			optional	ddb
+ddb/db_textdump.c		optional	ddb
+ddb/db_variables.c		optional	ddb
+ddb/db_watch.c			optional	ddb
+ddb/db_write_cmd.c		optional	ddb
+#dev/dpt/dpt_control.c		optional dpt
+dev/aac/aac.c			optional aac
+dev/aac/aac_cam.c		optional aacp aac
+dev/aac/aac_debug.c		optional aac
+dev/aac/aac_disk.c		optional aac
+dev/aac/aac_linux.c		optional aac compat_linux
+dev/aac/aac_pci.c		optional aac pci
+dev/acpi_support/acpi_wmi.c	optional acpi_wmi acpi
+dev/acpi_support/acpi_aiboost.c	optional acpi_aiboost acpi
+dev/acpi_support/acpi_asus.c	optional acpi_asus acpi
+dev/acpi_support/acpi_fujitsu.c	optional acpi_fujitsu acpi
+dev/acpi_support/acpi_hp.c	optional acpi_hp acpi
+dev/acpi_support/acpi_ibm.c	optional acpi_ibm acpi
+dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi
+dev/acpi_support/acpi_sony.c	optional acpi_sony acpi
+dev/acpi_support/acpi_toshiba.c	optional acpi_toshiba acpi
+dev/acpi_support/atk0110.c	optional aibs acpi
+dev/acpica/Osd/OsdDebug.c	optional acpi
+dev/acpica/Osd/OsdHardware.c	optional acpi
+dev/acpica/Osd/OsdInterrupt.c	optional acpi
+dev/acpica/Osd/OsdMemory.c	optional acpi
+dev/acpica/Osd/OsdSchedule.c	optional acpi
+dev/acpica/Osd/OsdStream.c	optional acpi
+dev/acpica/Osd/OsdSynch.c	optional acpi
+dev/acpica/Osd/OsdTable.c	optional acpi
+dev/acpica/acpi.c		optional acpi
+dev/acpica/acpi_acad.c		optional acpi
+dev/acpica/acpi_battery.c	optional acpi
+dev/acpica/acpi_button.c	optional acpi
+dev/acpica/acpi_cmbat.c		optional acpi
+dev/acpica/acpi_cpu.c		optional acpi
+dev/acpica/acpi_ec.c		optional acpi
+dev/acpica/acpi_hpet.c		optional acpi
+dev/acpica/acpi_isab.c		optional acpi isa
+dev/acpica/acpi_lid.c		optional acpi
+dev/acpica/acpi_package.c	optional acpi
+dev/acpica/acpi_pci.c		optional acpi pci
+dev/acpica/acpi_pci_link.c	optional acpi pci
+dev/acpica/acpi_pcib.c		optional acpi pci
+dev/acpica/acpi_pcib_acpi.c	optional acpi pci
+dev/acpica/acpi_pcib_pci.c	optional acpi pci
+dev/acpica/acpi_perf.c		optional acpi
+dev/acpica/acpi_powerres.c	optional acpi
+dev/acpica/acpi_quirk.c		optional acpi
+dev/acpica/acpi_resource.c	optional acpi
+dev/acpica/acpi_smbat.c		optional acpi
+dev/acpica/acpi_thermal.c	optional acpi
+dev/acpica/acpi_throttle.c	optional acpi
+dev/acpica/acpi_timer.c		optional acpi
+dev/acpica/acpi_video.c		optional acpi_video acpi
+dev/acpica/acpi_dock.c		optional acpi_dock acpi
+dev/adlink/adlink.c		optional adlink
+dev/advansys/adv_eisa.c		optional adv eisa
+dev/advansys/adv_pci.c		optional adv pci
+dev/advansys/advansys.c		optional adv
+dev/advansys/advlib.c		optional adv
+dev/advansys/advmcode.c		optional adv
+dev/advansys/adw_pci.c		optional adw pci
+dev/advansys/adwcam.c		optional adw
+dev/advansys/adwlib.c		optional adw
+dev/advansys/adwmcode.c		optional adw
+dev/ae/if_ae.c			optional ae pci
+dev/age/if_age.c		optional age pci inet
+dev/agp/agp.c			optional agp pci
+dev/agp/agp_if.m			optional agp pci
+dev/aha/aha.c			optional aha
+dev/aha/aha_isa.c		optional aha isa
+dev/aha/aha_mca.c		optional aha mca
+dev/ahb/ahb.c			optional ahb eisa
+dev/ahci/ahci.c			optional ahci pci
+dev/aic/aic.c			optional aic
+dev/aic/aic_pccard.c		optional aic pccard
+dev/aic7xxx/ahc_eisa.c		optional ahc eisa
+dev/aic7xxx/ahc_isa.c		optional ahc isa
+dev/aic7xxx/ahc_pci.c		optional ahc pci
+dev/aic7xxx/ahd_pci.c		optional ahd pci
+dev/aic7xxx/aic7770.c		optional ahc
+dev/aic7xxx/aic79xx.c		optional ahd pci
+dev/aic7xxx/aic79xx_osm.c	optional ahd pci
+dev/aic7xxx/aic79xx_pci.c	optional ahd pci
+dev/aic7xxx/aic7xxx.c		optional ahc
+dev/aic7xxx/aic7xxx_93cx6.c	optional ahc
+dev/aic7xxx/aic7xxx_osm.c	optional ahc
+dev/aic7xxx/aic7xxx_pci.c	optional ahc pci
+dev/alc/if_alc.c		optional alc pci inet
+dev/ale/if_ale.c		optional ale pci inet
+dev/amd/amd.c			optional amd
+dev/amr/amr.c			optional amr
+dev/amr/amr_cam.c		optional amrp amr
+dev/amr/amr_disk.c		optional amr
+dev/amr/amr_linux.c		optional amr compat_linux
+dev/amr/amr_pci.c		optional amr pci
+dev/an/if_an.c			optional an
+dev/an/if_an_isa.c		optional an isa
+dev/an/if_an_pccard.c		optional an pccard
+dev/an/if_an_pci.c		optional an pci
+dev/asr/asr.c			optional asr pci
+#
+dev/ata/ata_if.m		optional ata | atacore
+dev/ata/ata-all.c		optional ata | atacore
+dev/ata/ata-dma.c		optional ata | atacore
+dev/ata/ata-lowlevel.c		optional ata | atacore
+dev/ata/ata-queue.c		optional ata | atacore
+dev/ata/ata-sata.c		optional ata | atacore
+dev/ata/ata-card.c		optional ata pccard | atapccard
+dev/ata/ata-cbus.c		optional ata pc98 | atapc98
+dev/ata/ata-isa.c		optional ata isa | ataisa
+dev/ata/ata-pci.c		optional ata pci | atapci
+dev/ata/chipsets/ata-ahci.c	optional ata pci | ataahci | ataacerlabs | \
+					 ataati | ataintel | atajmicron | \
+					 atavia | atanvidia
+dev/ata/chipsets/ata-acard.c	optional ata pci | ataacard
+dev/ata/chipsets/ata-acerlabs.c	optional ata pci | ataacerlabs
+dev/ata/chipsets/ata-adaptec.c	optional ata pci | ataadaptec
+dev/ata/chipsets/ata-amd.c	optional ata pci | ataamd
+dev/ata/chipsets/ata-ati.c	optional ata pci | ataati
+dev/ata/chipsets/ata-cenatek.c	optional ata pci | atacenatek
+dev/ata/chipsets/ata-cypress.c	optional ata pci | atacypress
+dev/ata/chipsets/ata-cyrix.c	optional ata pci | atacyrix
+dev/ata/chipsets/ata-highpoint.c	optional ata pci | atahighpoint
+dev/ata/chipsets/ata-intel.c	optional ata pci | ataintel
+dev/ata/chipsets/ata-ite.c	optional ata pci | ataite
+dev/ata/chipsets/ata-jmicron.c	optional ata pci | atajmicron
+dev/ata/chipsets/ata-marvell.c	optional ata pci | atamarvell | ataadaptec
+dev/ata/chipsets/ata-micron.c	optional ata pci | atamicron
+dev/ata/chipsets/ata-national.c	optional ata pci | atanational
+dev/ata/chipsets/ata-netcell.c	optional ata pci | atanetcell
+dev/ata/chipsets/ata-nvidia.c	optional ata pci | atanvidia
+dev/ata/chipsets/ata-promise.c	optional ata pci | atapromise
+dev/ata/chipsets/ata-serverworks.c	optional ata pci | ataserverworks
+dev/ata/chipsets/ata-siliconimage.c	optional ata pci | atasiliconimage | ataati
+dev/ata/chipsets/ata-sis.c	optional ata pci | atasis
+dev/ata/chipsets/ata-via.c	optional ata pci | atavia
+dev/ata/ata-disk.c		optional atadisk
+dev/ata/ata-raid.c		optional ataraid
+dev/ata/atapi-cd.c		optional atapicd
+dev/ata/atapi-fd.c		optional atapifd
+dev/ata/atapi-tape.c		optional atapist
+dev/ata/atapi-cam.c		optional atapicam
+#
+dev/ath/if_ath.c		optional ath \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_pci.c		optional ath pci \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ah_osdep.c		optional ath \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+#
+dev/ath/ath_hal/ah.c		optional ath \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_eeprom_v1.c	optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_eeprom_v3.c	optional ath_hal | ath_ar5211 | ath_ar5212 \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_eeprom_v14.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_eeprom_v4k.c \
+	optional ath_hal | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_hal/ah_regdomain.c	optional ath \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+# ar5210
+dev/ath/ath_hal/ar5210/ar5210_attach.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_beacon.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_interrupts.c	optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_keycache.c	optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_misc.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_phy.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_power.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_recv.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_reset.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5210/ar5210_xmit.c		optional ath_hal | ath_ar5210 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# ar5211
+dev/ath/ath_hal/ar5211/ar5211_attach.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_beacon.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_interrupts.c	optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_keycache.c	optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_misc.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_phy.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_power.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_recv.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_reset.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5211/ar5211_xmit.c		optional ath_hal | ath_ar5211 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# ar5212
+dev/ath/ath_hal/ar5212/ar5212_ani.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_attach.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_beacon.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_eeprom.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_gpio.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_interrupts.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_keycache.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_misc.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_phy.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_power.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_recv.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_reset.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_rfgain.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5212_xmit.c \
+	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
+	ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# ar5416 (depends on ar5212)
+dev/ath/ath_hal/ar5416/ar5416_ani.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_attach.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_beacon.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal_iq.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_eeprom.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_gpio.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_interrupts.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_keycache.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_misc.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_phy.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_power.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_recv.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_reset.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar5416_xmit.c \
+	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# ar9160 (depends on ar5416)
+dev/ath/ath_hal/ar5416/ar9160_attach.c optional ath_hal | ath_ar9160 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# ar9280 (depends on ar5416)
+dev/ath/ath_hal/ar5416/ar9280_attach.c optional ath_hal | ath_ar9280 | \
+	ath_ar9285 \ 
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# ar9285 (depends on ar5416 and ar9280)
+dev/ath/ath_hal/ar5416/ar9285_attach.c optional ath_hal | ath_ar9285 \ 
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar9285_reset.c optional ath_hal | ath_ar9285 \ 
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# rf backends
+dev/ath/ath_hal/ar5212/ar2316.c	optional ath_rf2316 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar2317.c	optional ath_rf2317 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar2413.c	optional ath_hal | ath_rf2413 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar2425.c	optional ath_hal | ath_rf2425 | ath_rf2417 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5111.c	optional ath_hal | ath_rf5111 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5112.c	optional ath_hal | ath_rf5112 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5212/ar5413.c	optional ath_hal | ath_rf5413 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar2133.c optional ath_hal | ath_ar5416 | ath_ar9160 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar9280.c optional ath_hal | ath_ar9280 | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+dev/ath/ath_hal/ar5416/ar9285.c optional ath_hal | ath_ar9285 \
+	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
+# ath rate control algorithms
+dev/ath/ath_rate/amrr/amrr.c	optional ath_rate_amrr \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_rate/onoe/onoe.c	optional ath_rate_onoe \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_rate/sample/sample.c	optional ath_rate_sample \
+	compile-with "${NORMAL_C} -I$S/dev/ath"
+#
+dev/bce/if_bce.c		optional bce
+dev/bfe/if_bfe.c		optional bfe
+dev/bge/if_bge.c		optional bge
+dev/bktr/bktr_audio.c		optional bktr pci
+dev/bktr/bktr_card.c		optional bktr pci
+dev/bktr/bktr_core.c		optional bktr pci
+dev/bktr/bktr_i2c.c		optional bktr pci smbus
+dev/bktr/bktr_os.c		optional bktr pci
+dev/bktr/bktr_tuner.c		optional bktr pci
+dev/bktr/msp34xx.c		optional bktr pci
+dev/buslogic/bt.c		optional bt
+dev/buslogic/bt_eisa.c		optional bt eisa
+dev/buslogic/bt_isa.c		optional bt isa
+dev/buslogic/bt_mca.c		optional bt mca
+dev/buslogic/bt_pci.c		optional bt pci
+dev/bwi/bwimac.c		optional bwi
+dev/bwi/bwiphy.c		optional bwi
+dev/bwi/bwirf.c			optional bwi
+dev/bwi/if_bwi.c		optional bwi
+dev/bwi/if_bwi_pci.c		optional bwi pci
+dev/bwn/if_bwn.c		optional bwn siba_bwn
+dev/cardbus/cardbus.c		optional cardbus
+dev/cardbus/cardbus_cis.c	optional cardbus
+dev/cardbus/cardbus_device.c	optional cardbus
+dev/cas/if_cas.c		optional cas
+dev/cfi/cfi_core.c		optional cfi
+dev/cfi/cfi_dev.c		optional cfi
+dev/cfi/cfi_disk.c		optional cfid
+dev/ciss/ciss.c			optional ciss
+dev/cm/smc90cx6.c		optional cm
+dev/cmx/cmx.c			optional cmx
+dev/cmx/cmx_pccard.c		optional cmx pccard
+dev/cpufreq/ichss.c		optional cpufreq
+dev/cs/if_cs.c			optional cs
+dev/cs/if_cs_isa.c		optional cs isa
+dev/cs/if_cs_pccard.c		optional cs pccard
+dev/cxgb/cxgb_main.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_offload.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_sge.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_mc5.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_aq100x.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"	
+dev/cxgb/sys/uipc_mvec.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_t3fw.c		optional cxgb cxgb_t3fw \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cy/cy.c			optional cy
+dev/cy/cy_isa.c			optional cy isa
+dev/cy/cy_pci.c			optional cy pci
+dev/dc/if_dc.c			optional dc pci
+dev/dc/dcphy.c			optional dc pci
+dev/dc/pnphy.c			optional dc pci
+dev/dcons/dcons.c		optional dcons
+dev/dcons/dcons_crom.c		optional dcons_crom
+dev/dcons/dcons_os.c		optional dcons
+dev/de/if_de.c			optional de pci
+dev/digi/CX.c			optional digi_CX
+dev/digi/CX_PCI.c		optional digi_CX_PCI
+dev/digi/EPCX.c			optional digi_EPCX
+dev/digi/EPCX_PCI.c		optional digi_EPCX_PCI
+dev/digi/Xe.c			optional digi_Xe
+dev/digi/Xem.c			optional digi_Xem
+dev/digi/Xr.c			optional digi_Xr
+dev/digi/digi.c			optional digi
+dev/digi/digi_isa.c		optional digi isa
+dev/digi/digi_pci.c		optional digi pci
+dev/dpt/dpt_eisa.c		optional dpt eisa
+dev/dpt/dpt_pci.c		optional dpt pci
+dev/dpt/dpt_scsi.c		optional dpt
+dev/drm/ati_pcigart.c		optional drm
+dev/drm/drm_agpsupport.c	optional drm
+dev/drm/drm_auth.c		optional drm
+dev/drm/drm_bufs.c		optional drm
+dev/drm/drm_context.c		optional drm
+dev/drm/drm_dma.c		optional drm
+dev/drm/drm_drawable.c		optional drm
+dev/drm/drm_drv.c		optional drm
+dev/drm/drm_fops.c		optional drm
+dev/drm/drm_ioctl.c		optional drm
+dev/drm/drm_irq.c		optional drm
+dev/drm/drm_lock.c		optional drm
+dev/drm/drm_memory.c		optional drm
+dev/drm/drm_pci.c		optional drm
+dev/drm/drm_scatter.c		optional drm
+dev/drm/drm_sysctl.c		optional drm
+dev/drm/drm_vm.c		optional drm
+dev/drm/i915_dma.c		optional i915drm
+dev/drm/i915_drv.c		optional i915drm
+dev/drm/i915_irq.c		optional i915drm
+dev/drm/i915_mem.c		optional i915drm
+dev/drm/i915_suspend.c		optional i915drm
+dev/drm/mach64_dma.c		optional mach64drm
+dev/drm/mach64_drv.c		optional mach64drm
+dev/drm/mach64_irq.c		optional mach64drm
+dev/drm/mach64_state.c		optional mach64drm
+dev/drm/mga_dma.c		optional mgadrm
+dev/drm/mga_drv.c		optional mgadrm
+dev/drm/mga_irq.c		optional mgadrm
+dev/drm/mga_state.c		optional mgadrm \
+	compile-with "${NORMAL_C} -finline-limit=13500"
+dev/drm/mga_warp.c		optional mgadrm
+dev/drm/r128_cce.c		optional r128drm
+dev/drm/r128_drv.c		optional r128drm
+dev/drm/r128_irq.c		optional r128drm
+dev/drm/r128_state.c		optional r128drm \
+	compile-with "${NORMAL_C} -finline-limit=13500"
+dev/drm/r300_cmdbuf.c		optional radeondrm
+dev/drm/r600_blit.c		optional radeondrm
+dev/drm/r600_cp.c		optional radeondrm
+dev/drm/radeon_cp.c		optional radeondrm
+dev/drm/radeon_cs.c		optional radeondrm
+dev/drm/radeon_drv.c		optional radeondrm
+dev/drm/radeon_irq.c		optional radeondrm
+dev/drm/radeon_mem.c		optional radeondrm
+dev/drm/radeon_state.c		optional radeondrm
+dev/drm/savage_bci.c		optional savagedrm
+dev/drm/savage_drv.c		optional savagedrm
+dev/drm/savage_state.c		optional savagedrm
+dev/drm/sis_drv.c		optional sisdrm
+dev/drm/sis_ds.c		optional sisdrm
+dev/drm/sis_mm.c		optional sisdrm
+dev/drm/tdfx_drv.c		optional tdfxdrm
+dev/ed/if_ed.c			optional ed
+dev/ed/if_ed_novell.c		optional ed
+dev/ed/if_ed_rtl80x9.c		optional ed
+dev/ed/if_ed_pccard.c		optional ed pccard
+dev/ed/if_ed_pci.c		optional ed pci
+dev/eisa/eisa_if.m		standard
+dev/eisa/eisaconf.c		optional eisa
+dev/e1000/if_em.c		optional em inet \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/if_lem.c		optional em inet \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/if_igb.c		optional igb inet \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_80003es2lan.c	optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82540.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82541.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82542.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82543.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82571.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_82575.c		optional em | igb \
+	 compile-with "${NORMAL_C} -I$S/dev/igb"
+dev/e1000/e1000_ich8lan.c	optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_api.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_mac.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_manage.c	optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_nvm.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_phy.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_vf.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_mbx.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/e1000/e1000_osdep.c		optional em | igb \
+	compile-with "${NORMAL_C} -I$S/dev/e1000"
+dev/et/if_et.c			optional et
+dev/en/if_en_pci.c		optional en pci
+dev/en/midway.c			optional en
+dev/ep/if_ep.c			optional ep
+dev/ep/if_ep_eisa.c		optional ep eisa
+dev/ep/if_ep_isa.c		optional ep isa
+dev/ep/if_ep_mca.c		optional ep mca
+dev/ep/if_ep_pccard.c		optional ep pccard
+dev/esp/ncr53c9x.c		optional esp
+dev/ex/if_ex.c			optional ex
+dev/ex/if_ex_isa.c		optional ex isa
+dev/ex/if_ex_pccard.c		optional ex pccard
+dev/exca/exca.c			optional cbb
+dev/fatm/if_fatm.c		optional fatm pci
+dev/fb/splash.c			optional splash
+dev/fe/if_fe.c			optional fe
+dev/fe/if_fe_pccard.c		optional fe pccard
+dev/firewire/firewire.c		optional firewire
+dev/firewire/fwcrom.c		optional firewire
+dev/firewire/fwdev.c		optional firewire
+dev/firewire/fwdma.c		optional firewire
+dev/firewire/fwmem.c		optional firewire
+dev/firewire/fwohci.c		optional firewire
+dev/firewire/fwohci_pci.c	optional firewire pci
+dev/firewire/if_fwe.c		optional fwe
+dev/firewire/if_fwip.c		optional fwip
+dev/firewire/sbp.c		optional sbp
+dev/firewire/sbp_targ.c		optional sbp_targ
+dev/flash/at45d.c		optional at45d
+dev/fxp/if_fxp.c		optional fxp inet
+dev/gem/if_gem.c		optional gem
+dev/gem/if_gem_pci.c		optional gem pci
+dev/gem/if_gem_sbus.c		optional gem sbus
+dev/hatm/if_hatm.c		optional hatm pci
+dev/hatm/if_hatm_intr.c		optional hatm pci
+dev/hatm/if_hatm_ioctl.c	optional hatm pci
+dev/hatm/if_hatm_rx.c		optional hatm pci
+dev/hatm/if_hatm_tx.c		optional hatm pci
+dev/hifn/hifn7751.c		optional hifn
+dev/hme/if_hme.c		optional hme
+dev/hme/if_hme_pci.c		optional hme pci
+dev/hme/if_hme_sbus.c		optional hme sbus
+dev/hptiop/hptiop.c		optional hptiop scbus
+dev/hwpmc/hwpmc_logging.c	optional hwpmc
+dev/hwpmc/hwpmc_mod.c		optional hwpmc
+dev/ichsmb/ichsmb.c		optional ichsmb
+dev/ichsmb/ichsmb_pci.c		optional ichsmb pci
+dev/ida/ida.c			optional ida
+dev/ida/ida_disk.c		optional ida
+dev/ida/ida_eisa.c		optional ida eisa
+dev/ida/ida_pci.c		optional ida pci
+dev/ie/if_ie.c			optional ie isa nowerror

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 20:54:46 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 5A3EF1065673
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 20:54:44 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 20:54:44 +0000
Date: Fri, 10 Jun 2011 20:54:44 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610205444.5A3EF1065673@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223083 -
	soc2011/gk/ino64-head/tools/tools/shlib-compat
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 20:54:46 -0000

Author: gk
Date: Fri Jun 10 20:54:44 2011
New Revision: 223083
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223083

Log:
  shlib-compat: support multiple --alias-prefix options
  
  Merge rev f7f9608225afc8c1f3f8

Modified:
  soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat

Modified: soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat
==============================================================================
--- soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat	Fri Jun 10 19:16:50 2011	(r223082)
+++ soc2011/gk/ino64-head/tools/tools/shlib-compat/shlib-compat	Fri Jun 10 20:54:44 2011	(r223083)
@@ -37,7 +37,7 @@
     no_dump = False
     version_filter = None
     symbol_filter = None
-    alias_prefix = None
+    alias_prefixes = []
     # misc opts
     objdump = 'objdump'
     dwarfdump = 'dwarfdump'
@@ -193,10 +193,10 @@
         return "CommonSymbol(%s, %s)" % (self.name, self.version)
 
 class SymbolAlias(object):
-    def __init__(self, alias, offset):
-        assert alias.startswith(Config.alias_prefix)
+    def __init__(self, alias, prefix, offset):
+        assert alias.startswith(prefix)
         self.alias = alias
-        self.name = alias[len(Config.alias_prefix):]
+        self.name = alias[len(prefix):]
         self.offset = offset
 
     def __repr__(self):
@@ -603,11 +603,13 @@
             if not self.versions.has_key(vername):
                 self.versions[vername] = VersionMap(vername)
             self.versions[vername].append(sym)
-        if Config.alias_prefix:
+        if Config.alias_prefixes:
             self.local_offsetmap = objdump.local_offsetmap
             for p in objdump.local_symbols:
-                if p['symbol'].startswith(Config.alias_prefix):
-                    alias = SymbolAlias(p['symbol'], p['offset'])
+                for prefix in Config.alias_prefixes:
+                    if not p['symbol'].startswith(prefix):
+                        continue
+                    alias = SymbolAlias(p['symbol'], prefix, p['offset'])
                     if self.alias_syms.has_key(alias.name):
                         print >> sys.stderr, "WARN: Symbol alias is already defined: %s/%s" % \
                                 (self.name, self.alias)
@@ -986,7 +988,7 @@
             version="%prog " + Config.version)
     parser.add_option('-v', '--verbose', action='count',
             help="verbose mode, may be specified several times")
-    parser.add_option('--alias-prefix', action='store',
+    parser.add_option('--alias-prefix', action='append',
             help="name prefix to try for symbol alias lookup", metavar="STR")
     parser.add_option('--dump', action='store_true',
             help="dump symbol definitions")
@@ -1019,7 +1021,8 @@
     if opts.verbose:
         Config.verbose = opts.verbose
     if opts.alias_prefix:
-        Config.alias_prefix = opts.alias_prefix
+        Config.alias_prefixes = opts.alias_prefix
+        Config.alias_prefixes.sort(key=lambda x: -len(x))
     for (k, v) in ({ '_sym': Config.symbol_filter,
             '_ver': Config.version_filter }).items():
         for a in [ 'exclude', 'include' ]:

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 20:54:59 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 34AE9106564A
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 20:54:57 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 20:54:57 +0000
Date: Fri, 10 Jun 2011 20:54:57 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610205457.34AE9106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223084 - in soc2011/gk/ino64-head: lib/libprocstat
	usr.bin/fstat
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 20:54:59 -0000

Author: gk
Date: Fri Jun 10 20:54:56 2011
New Revision: 223084
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223084

Log:
  Don't cast uint64_t inode number or size down to long or unsigned
  
  Casting to long will drop significant bits on 32bit archs
  
  *node.i_number and *node.i_size are unsigned

Modified:
  soc2011/gk/ino64-head/lib/libprocstat/cd9660.c
  soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c
  soc2011/gk/ino64-head/usr.bin/fstat/fstat.c

Modified: soc2011/gk/ino64-head/lib/libprocstat/cd9660.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libprocstat/cd9660.c	Fri Jun 10 20:54:44 2011	(r223083)
+++ soc2011/gk/ino64-head/lib/libprocstat/cd9660.c	Fri Jun 10 20:54:56 2011	(r223084)
@@ -84,7 +84,7 @@
 	}
 	vn->vn_fsid = dev2udev(kd, mnt.im_dev);
 	vn->vn_mode = (mode_t)isonode.inode.iso_mode;
-	vn->vn_fileid = (long)isonode.i_number;
-	vn->vn_size = (u_long)isonode.i_size;
+	vn->vn_fileid = isonode.i_number;
+	vn->vn_size = isonode.i_size;
 	return (0);
 }

Modified: soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c
==============================================================================
--- soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c	Fri Jun 10 20:54:44 2011	(r223083)
+++ soc2011/gk/ino64-head/lib/libprocstat/common_kvm.c	Fri Jun 10 20:54:56 2011	(r223084)
@@ -99,9 +99,9 @@
 	 * comparisons
 	 */
 	vn->vn_fsid = dev2udev(kd, inode.i_dev);
-	vn->vn_fileid = (long)inode.i_number;
+	vn->vn_fileid = inode.i_number;
 	vn->vn_mode = (mode_t)inode.i_mode;
-	vn->vn_size = (u_long)inode.i_size;
+	vn->vn_size = inode.i_size;
 	return (0);
 }
 

Modified: soc2011/gk/ino64-head/usr.bin/fstat/fstat.c
==============================================================================
--- soc2011/gk/ino64-head/usr.bin/fstat/fstat.c	Fri Jun 10 20:54:44 2011	(r223083)
+++ soc2011/gk/ino64-head/usr.bin/fstat/fstat.c	Fri Jun 10 20:54:56 2011	(r223084)
@@ -242,7 +242,7 @@
 		for (d = devs; d != NULL; d = d->next)
 			if (d->fsid == vn.vn_fsid) {
 				fsmatch = 1;
-				if ((unsigned)d->ino == vn.vn_fileid) {
+				if (d->ino == vn.vn_fileid) {
 					filename = d->name;
 					break;
 				}

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 20:55:07 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id B6228106566B
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 20:55:06 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 20:55:06 +0000
Date: Fri, 10 Jun 2011 20:55:06 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610205506.B6228106566B@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223085 - soc2011/gk/ino64-head/usr.sbin/quot
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 20:55:07 -0000

Author: gk
Date: Fri Jun 10 20:55:06 2011
New Revision: 223085
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223085

Log:
  usr.sbin/quot: Change inode type to uintmax_t to keep scanf() happy

Modified:
  soc2011/gk/ino64-head/usr.sbin/quot/quot.c

Modified: soc2011/gk/ino64-head/usr.sbin/quot/quot.c
==============================================================================
--- soc2011/gk/ino64-head/usr.sbin/quot/quot.c	Fri Jun 10 20:54:56 2011	(r223084)
+++ soc2011/gk/ino64-head/usr.sbin/quot/quot.c	Fri Jun 10 20:55:06 2011	(r223085)
@@ -484,7 +484,7 @@
 donames(int fd, struct fs *super, char *name)
 {
 	int c;
-	ino_t inode;
+	uintmax_t inode;
 	ino_t maxino;
 	union dinode *dp;
 
@@ -495,7 +495,7 @@
 	ungetc(c,stdin);
 	while (scanf("%ju", &inode) == 1) {
 		if (inode > maxino) {
-			warnx("illegal inode %ju", (uintmax_t)inode);
+			warnx("illegal inode %ju", inode);
 			return;
 		}
 		errno = 0;

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 20:55:19 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 735A9106564A
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 20:55:17 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 20:55:17 +0000
Date: Fri, 10 Jun 2011 20:55:17 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610205517.735A9106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223086 - in soc2011/gk/ino64-head/sys:
	compat/freebsd32 kern
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 20:55:19 -0000

Author: gk
Date: Fri Jun 10 20:55:17 2011
New Revision: 223086
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223086

Log:
  Add a new COMPAT8 flag for FreeBSD 8.x compatibility system calls.

Modified:
  soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master
  soc2011/gk/ino64-head/sys/kern/makesyscalls.sh
  soc2011/gk/ino64-head/sys/kern/syscalls.master

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master	Fri Jun 10 20:55:06 2011	(r223085)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master	Fri Jun 10 20:55:17 2011	(r223086)
@@ -13,7 +13,7 @@
 ;		case where the event exists, but we don't want auditing, the
 ;		event should be #defined to AUE_NULL in audit_kevents.h.
 ;	type	one of STD, OBSOL, UNIMPL, COMPAT, COMPAT4, COMPAT6,
-;		COMPAT7, NODEF, NOARGS, NOPROTO, NOSTD
+;		COMPAT7, COMPAT8, NODEF, NOARGS, NOPROTO, NOSTD
 ;		The COMPAT* options may be combined with one or more NO*
 ;		options separated by '|' with no spaces (e.g. COMPAT|NOARGS)
 ;	name	psuedo-prototype of syscall routine
@@ -29,6 +29,7 @@
 ;	COMPAT4	included on COMPAT4 #ifdef (FreeBSD 4 compat)
 ;	COMPAT6	included on COMPAT6 #ifdef (FreeBSD 6 compat)
 ;	COMPAT7	included on COMPAT7 #ifdef (FreeBSD 7 compat)
+;	COMPAT8	included on COMPAT8 #ifdef (FreeBSD 8 compat)
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 ;	NOSTD	implemented but as a lkm that can be statically

Modified: soc2011/gk/ino64-head/sys/kern/makesyscalls.sh
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/makesyscalls.sh	Fri Jun 10 20:55:06 2011	(r223085)
+++ soc2011/gk/ino64-head/sys/kern/makesyscalls.sh	Fri Jun 10 20:55:17 2011	(r223086)
@@ -9,6 +9,7 @@
 compat4=COMPAT_FREEBSD4
 compat6=COMPAT_FREEBSD6
 compat7=COMPAT_FREEBSD7
+compat8=COMPAT_FREEBSD8
 
 # output files:
 sysnames="syscalls.c"
@@ -33,6 +34,8 @@
 syscompat6dcl="sysent.compat6dcl.$$"
 syscompat7="sysent.compat7.$$"
 syscompat7dcl="sysent.compat7dcl.$$"
+syscompat8="sysent.compat8.$$"
+syscompat8dcl="sysent.compat8dcl.$$"
 sysent="sysent.switch.$$"
 sysinc="sysinc.switch.$$"
 sysarg="sysarg.switch.$$"
@@ -46,9 +49,9 @@
 	capenabled=""
 fi
 
-trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp" 0
+trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat8 $syscompat8dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp" 0
 
-touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp
+touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat8 $syscompat8dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp
 
 case $# in
     0)	echo "usage: $0 input-file <config-file>" 1>&2
@@ -87,6 +90,8 @@
 		syscompat6dcl = \"$syscompat6dcl\"
 		syscompat7 = \"$syscompat7\"
 		syscompat7dcl = \"$syscompat7dcl\"
+		syscompat8 = \"$syscompat8\"
+		syscompat8dcl = \"$syscompat8dcl\"
 		sysent = \"$sysent\"
 		syssw = \"$syssw\"
 		sysinc = \"$sysinc\"
@@ -100,6 +105,7 @@
 		compat4 = \"$compat4\"
 		compat6 = \"$compat6\"
 		compat7 = \"$compat7\"
+		compat8 = \"$compat8\"
 		syscallprefix = \"$syscallprefix\"
 		switchname = \"$switchname\"
 		namesname = \"$namesname\"
@@ -121,6 +127,7 @@
 		printf "\n#ifdef %s\n\n", compat4 > syscompat4
 		printf "\n#ifdef %s\n\n", compat6 > syscompat6
 		printf "\n#ifdef %s\n\n", compat7 > syscompat7
+		printf "\n#ifdef %s\n\n", compat8 > syscompat8
 
 		printf "/*\n * System call names.\n *\n" > sysnames
 		printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnames
@@ -199,6 +206,7 @@
 		print > syscompat4
 		print > syscompat6
 		print > syscompat7
+		print > syscompat8
 		print > sysnames
 		print > systrace
 		print > systracetmp
@@ -213,6 +221,7 @@
 		print > syscompat4
 		print > syscompat6
 		print > syscompat7
+		print > syscompat8
 		print > sysnames
 		print > systrace
 		print > systracetmp
@@ -227,6 +236,7 @@
 		print > syscompat4
 		print > syscompat6
 		print > syscompat7
+		print > syscompat8
 		print > sysnames
 		print > systrace
 		print > systracetmp
@@ -330,6 +340,8 @@
 				argalias = "freebsd6_" argalias
 			if (flag("COMPAT7"))
 				argalias = "freebsd7_" argalias
+			if (flag("COMPAT8"))
+				argalias = "freebsd8_" argalias
 		}
 		f++
 
@@ -452,7 +464,7 @@
 		next
 	}
 	type("COMPAT") || type("COMPAT4") || type("COMPAT6") || \
-	    type("COMPAT7") {
+	    type("COMPAT7") || type("COMPAT8") {
 		if (flag("COMPAT")) {
 			ncompat++
 			out = syscompat
@@ -481,6 +493,13 @@
 			wrap = "compat7"
 			prefix = "freebsd7_"
 			descr = "freebsd7"
+		} else if (flag("COMPAT8")) {
+			ncompat8++
+			out = syscompat8
+			outdcl = syscompat8dcl
+			wrap = "compat8"
+			prefix = "freebsd8_"
+			descr = "freebsd8"
 		}
 		parseline()
 		if (argc != 0 && !flag("NOARGS") && !flag("NOPROTO") && \
@@ -555,7 +574,7 @@
 	END {
 		printf "\n#define AS(name) (sizeof(struct name) / sizeof(register_t))\n" > sysinc
 
-		if (ncompat != 0 || ncompat4 != 0 || ncompat6 != 0 || ncompat7 != 0)
+		if (ncompat != 0 || ncompat4 != 0 || ncompat6 != 0 || ncompat7 != 0 || ncompat8 != 0)
 			printf "#include \"opt_compat.h\"\n\n" > syssw
 
 		if (ncompat != 0) {
@@ -590,10 +609,19 @@
 			printf "#endif\n" > sysinc
 		}
 
+		if (ncompat8 != 0) {
+			printf "\n#ifdef %s\n", compat8 > sysinc
+			printf "#define compat8(n, name) n, (sy_call_t *)__CONCAT(freebsd8_,name)\n" > sysinc
+			printf "#else\n" > sysinc
+			printf "#define compat8(n, name) 0, (sy_call_t *)nosys\n" > sysinc
+			printf "#endif\n" > sysinc
+		}
+
 		printf("\n#endif /* %s */\n\n", compat) > syscompatdcl
 		printf("\n#endif /* %s */\n\n", compat4) > syscompat4dcl
 		printf("\n#endif /* %s */\n\n", compat6) > syscompat6dcl
 		printf("\n#endif /* %s */\n\n", compat7) > syscompat7dcl
+		printf("\n#endif /* %s */\n\n", compat8) > syscompat8dcl
 
 		printf("\n#undef PAD_\n") > sysprotoend
 		printf("#undef PADL_\n") > sysprotoend
@@ -615,6 +643,7 @@
 	$syscompat4 $syscompat4dcl \
 	$syscompat6 $syscompat6dcl \
 	$syscompat7 $syscompat7dcl \
+	$syscompat8 $syscompat8dcl \
 	$sysaue $sysprotoend > $sysproto
 cat $systracetmp >> $systrace
 

Modified: soc2011/gk/ino64-head/sys/kern/syscalls.master
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/syscalls.master	Fri Jun 10 20:55:06 2011	(r223085)
+++ soc2011/gk/ino64-head/sys/kern/syscalls.master	Fri Jun 10 20:55:17 2011	(r223086)
@@ -12,7 +12,7 @@
 ;		case where the event exists, but we don't want auditing, the
 ;		event should be #defined to AUE_NULL in audit_kevents.h.
 ;	type	one of STD, OBSOL, UNIMPL, COMPAT, COMPAT4, COMPAT6,
-;		COMPAT7, NODEF, NOARGS, NOPROTO, NOSTD
+;		COMPAT7, COMPAT8, NODEF, NOARGS, NOPROTO, NOSTD
 ;		The COMPAT* options may be combined with one or more NO*
 ;		options separated by '|' with no spaces (e.g. COMPAT|NOARGS)
 ;	name	psuedo-prototype of syscall routine
@@ -28,6 +28,7 @@
 ;	COMPAT4	included on COMPAT4 #ifdef (FreeBSD 4 compat)
 ;	COMPAT6	included on COMPAT6 #ifdef (FreeBSD 6 compat)
 ;	COMPAT7	included on COMPAT7 #ifdef (FreeBSD 7 compat)
+;	COMPAT8	included on COMPAT8 #ifdef (FreeBSD 8 compat)
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 ;	NOSTD	implemented but as a lkm that can be statically

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 20:55:39 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 5E4EF1065673
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 20:55:37 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 20:55:37 +0000
Date: Fri, 10 Jun 2011 20:55:37 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610205537.5E4EF1065673@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223087 - in soc2011/gk/ino64-head/sys: amd64/conf
	conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 20:55:39 -0000

Author: gk
Date: Fri Jun 10 20:55:37 2011
New Revision: 223087
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223087

Log:
  Add COMPAT_FREEBSD8 option to kernel configs

Modified:
  soc2011/gk/ino64-head/sys/amd64/conf/GENERIC
  soc2011/gk/ino64-head/sys/conf/NOTES
  soc2011/gk/ino64-head/sys/conf/options
  soc2011/gk/ino64-head/sys/i386/conf/GENERIC
  soc2011/gk/ino64-head/sys/i386/conf/XEN
  soc2011/gk/ino64-head/sys/ia64/conf/GENERIC
  soc2011/gk/ino64-head/sys/pc98/conf/GENERIC
  soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC
  soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC64
  soc2011/gk/ino64-head/sys/sparc64/conf/GENERIC

Modified: soc2011/gk/ino64-head/sys/amd64/conf/GENERIC
==============================================================================
--- soc2011/gk/ino64-head/sys/amd64/conf/GENERIC	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/amd64/conf/GENERIC	Fri Jun 10 20:55:37 2011	(r223087)
@@ -49,6 +49,7 @@
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8		# Compatible with FreeBSD8
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support

Modified: soc2011/gk/ino64-head/sys/conf/NOTES
==============================================================================
--- soc2011/gk/ino64-head/sys/conf/NOTES	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/conf/NOTES	Fri Jun 10 20:55:37 2011	(r223087)
@@ -326,6 +326,9 @@
 # Enable FreeBSD7 compatibility syscalls
 options 	COMPAT_FREEBSD7
 
+# Enable FreeBSD8 compatibility syscalls
+options 	COMPAT_FREEBSD8
+
 #
 # These three options provide support for System V Interface
 # Definition-style interprocess communication, in the form of shared

Modified: soc2011/gk/ino64-head/sys/conf/options
==============================================================================
--- soc2011/gk/ino64-head/sys/conf/options	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/conf/options	Fri Jun 10 20:55:37 2011	(r223087)
@@ -71,6 +71,7 @@
 COMPAT_FREEBSD5	opt_compat.h
 COMPAT_FREEBSD6	opt_compat.h
 COMPAT_FREEBSD7	opt_compat.h
+COMPAT_FREEBSD8	opt_compat.h
 COMPILING_LINT	opt_global.h
 COMPRESS_USER_CORES opt_core.h
 CY_PCI_FASTINTR

Modified: soc2011/gk/ino64-head/sys/i386/conf/GENERIC
==============================================================================
--- soc2011/gk/ino64-head/sys/i386/conf/GENERIC	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/i386/conf/GENERIC	Fri Jun 10 20:55:37 2011	(r223087)
@@ -50,6 +50,7 @@
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8		# Compatible with FreeBSD8
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support

Modified: soc2011/gk/ino64-head/sys/i386/conf/XEN
==============================================================================
--- soc2011/gk/ino64-head/sys/i386/conf/XEN	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/i386/conf/XEN	Fri Jun 10 20:55:37 2011	(r223087)
@@ -35,6 +35,7 @@
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8		# Compatible with FreeBSD8
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support
 options 	SYSVSHM			# SYSV-style shared memory

Modified: soc2011/gk/ino64-head/sys/ia64/conf/GENERIC
==============================================================================
--- soc2011/gk/ino64-head/sys/ia64/conf/GENERIC	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/ia64/conf/GENERIC	Fri Jun 10 20:55:37 2011	(r223087)
@@ -28,6 +28,7 @@
 options 	AUDIT		# Security event auditing
 options 	CD9660		# ISO 9660 Filesystem
 options 	COMPAT_FREEBSD7	# Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8	# Compatible with FreeBSD8
 options 	DDB		# Support DDB
 options 	DEADLKRES	# Enable the deadlock resolver
 options 	FFS		# Berkeley Fast Filesystem

Modified: soc2011/gk/ino64-head/sys/pc98/conf/GENERIC
==============================================================================
--- soc2011/gk/ino64-head/sys/pc98/conf/GENERIC	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/pc98/conf/GENERIC	Fri Jun 10 20:55:37 2011	(r223087)
@@ -50,6 +50,7 @@
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8		# Compatible with FreeBSD8
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	EPSON_BOUNCEDMA		# use bounce buffer for 15-16M
 #options 	EPSON_MEMWIN		# EPSON memory window support

Modified: soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC
==============================================================================
--- soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC	Fri Jun 10 20:55:37 2011	(r223087)
@@ -54,6 +54,7 @@
 options 	COMPAT_FREEBSD5		#Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		#Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		#Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8		#Compatible with FreeBSD8
 options 	SCSI_DELAY=5000		#Delay (in ms) before probing SCSI 
 options 	KTRACE			#ktrace(1) syscall trace support
 options 	STACK			#stack(9) support

Modified: soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC64
==============================================================================
--- soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC64	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/powerpc/conf/GENERIC64	Fri Jun 10 20:55:37 2011	(r223087)
@@ -54,6 +54,7 @@
 options 	COMPAT_FREEBSD5		#Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		#Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		#Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8		#Compatible with FreeBSD8
 options 	SCSI_DELAY=5000		#Delay (in ms) before probing SCSI 
 options 	KTRACE			#ktrace(1) syscall trace support
 options 	STACK			#stack(9) support

Modified: soc2011/gk/ino64-head/sys/sparc64/conf/GENERIC
==============================================================================
--- soc2011/gk/ino64-head/sys/sparc64/conf/GENERIC	Fri Jun 10 20:55:17 2011	(r223086)
+++ soc2011/gk/ino64-head/sys/sparc64/conf/GENERIC	Fri Jun 10 20:55:37 2011	(r223087)
@@ -50,6 +50,7 @@
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
 options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
+options 	COMPAT_FREEBSD8		# Compatible with FreeBSD8
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) support

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 20:55:55 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 6EF79106566B
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 20:55:53 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 20:55:53 +0000
Date: Fri, 10 Jun 2011 20:55:53 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610205553.6EF79106566B@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223088 - in soc2011/gk/ino64-head: lib/libc/include
	sys/compat/freebsd32 sys/kern sys/sys
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 20:55:55 -0000

Author: gk
Date: Fri Jun 10 20:55:53 2011
New Revision: 223088
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223088

Log:
  Move nstat* syscalls under COMPAT8
  
  Mark nstat* syscalls OBSOL for freebsd32 as they've never actually worked.

Modified:
  soc2011/gk/ino64-head/lib/libc/include/compat.h
  soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master
  soc2011/gk/ino64-head/sys/kern/kern_descrip.c
  soc2011/gk/ino64-head/sys/kern/syscalls.master
  soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c
  soc2011/gk/ino64-head/sys/sys/vnode.h

Modified: soc2011/gk/ino64-head/lib/libc/include/compat.h
==============================================================================
--- soc2011/gk/ino64-head/lib/libc/include/compat.h	Fri Jun 10 20:55:37 2011	(r223087)
+++ soc2011/gk/ino64-head/lib/libc/include/compat.h	Fri Jun 10 20:55:53 2011	(r223088)
@@ -42,6 +42,10 @@
 __sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0);
 __sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0);
 
+__sym_compat(nfstat, freebsd8_nfstat, FBSD_1.0);
+__sym_compat(nlstat, freebsd8_nlstat, FBSD_1.0);
+__sym_compat(nstat, freebsd8_nstat, FBSD_1.0);
+
 #undef __sym_compat
 
 #endif	/* __LIBC_COMPAT_H__ */

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master	Fri Jun 10 20:55:37 2011	(r223087)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master	Fri Jun 10 20:55:53 2011	(r223088)
@@ -496,9 +496,9 @@
 				    struct timeval32 *tptr); }
 277	AUE_MSYNC	NOPROTO	{ int msync(void *addr, size_t len, \
 				    int flags); } netbsd_msync msync_args int
-278	AUE_STAT	NOPROTO	{ int nstat(char *path, struct nstat *ub); }
-279	AUE_FSTAT	NOPROTO	{ int nfstat(int fd, struct nstat *sb); }
-280	AUE_LSTAT	NOPROTO	{ int nlstat(char *path, struct nstat *ub); }
+278	AUE_STAT	OBSOL	nstat
+279	AUE_FSTAT	OBSOL	nfstat
+280	AUE_LSTAT	OBSOL	nlstat
 281	AUE_NULL	UNIMPL	nosys
 282	AUE_NULL	UNIMPL	nosys
 283	AUE_NULL	UNIMPL	nosys

Modified: soc2011/gk/ino64-head/sys/kern/kern_descrip.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/kern_descrip.c	Fri Jun 10 20:55:37 2011	(r223087)
+++ soc2011/gk/ino64-head/sys/kern/kern_descrip.c	Fri Jun 10 20:55:53 2011	(r223088)
@@ -1315,18 +1315,21 @@
 	return (error);
 }
 
+#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) || \
+    defined(COMPAT_FREEBSD8)
 /*
  * Return status information about a file descriptor.
  */
 #ifndef _SYS_SYSPROTO_H_
-struct nfstat_args {
+struct freebsd8_nfstat_args {
 	int	fd;
 	struct	nstat *sb;
 };
 #endif
 /* ARGSUSED */
 int
-nfstat(struct thread *td, struct nfstat_args *uap)
+freebsd8_nfstat(struct thread *td, struct freebsd8_nfstat_args *uap)
 {
 	struct nstat nub;
 	struct stat ub;
@@ -1334,11 +1337,12 @@
 
 	error = kern_fstat(td, uap->fd, &ub);
 	if (error == 0) {
-		cvtnstat(&ub, &nub);
+		freebsd8_cvtnstat(&ub, &nub);
 		error = copyout(&nub, uap->sb, sizeof(nub));
 	}
 	return (error);
 }
+#endif /* COMPAT_FREEBSD8 */
 
 /*
  * Return pathconf information about a file descriptor.

Modified: soc2011/gk/ino64-head/sys/kern/syscalls.master
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/syscalls.master	Fri Jun 10 20:55:37 2011	(r223087)
+++ soc2011/gk/ino64-head/sys/kern/syscalls.master	Fri Jun 10 20:55:53 2011	(r223088)
@@ -504,9 +504,9 @@
 				    struct timeval *tptr); }
 277	AUE_MSYNC	NOPROTO	{ int msync(void *addr, size_t len, \
 				    int flags); } netbsd_msync msync_args int
-278	AUE_STAT	STD	{ int nstat(char *path, struct nstat *ub); }
-279	AUE_FSTAT	STD	{ int nfstat(int fd, struct nstat *sb); }
-280	AUE_LSTAT	STD	{ int nlstat(char *path, struct nstat *ub); }
+278	AUE_STAT	COMPAT8	{ int nstat(char *path, struct nstat *ub); }
+279	AUE_FSTAT	COMPAT8	{ int nfstat(int fd, struct nstat *sb); }
+280	AUE_LSTAT	COMPAT8	{ int nlstat(char *path, struct nstat *ub); }
 281	AUE_NULL	UNIMPL	nosys
 282	AUE_NULL	UNIMPL	nosys
 283	AUE_NULL	UNIMPL	nosys

Modified: soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c	Fri Jun 10 20:55:37 2011	(r223087)
+++ soc2011/gk/ino64-head/sys/kern/vfs_syscalls.c	Fri Jun 10 20:55:53 2011	(r223088)
@@ -2407,11 +2407,14 @@
 	    sbp));
 }
 
+#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) || \
+    defined(COMPAT_FREEBSD8)
 /*
  * Implementation of the NetBSD [l]stat() functions.
  */
 void
-cvtnstat(sb, nsb)
+freebsd8_cvtnstat(sb, nsb)
 	struct stat *sb;
 	struct nstat *nsb;
 {
@@ -2435,15 +2438,15 @@
 }
 
 #ifndef _SYS_SYSPROTO_H_
-struct nstat_args {
+struct freebsd8_nstat_args {
 	char	*path;
 	struct nstat *ub;
 };
 #endif
 int
-nstat(td, uap)
+freebsd8_nstat(td, uap)
 	struct thread *td;
-	register struct nstat_args /* {
+	register struct freebsd8_nstat_args /* {
 		char *path;
 		struct nstat *ub;
 	} */ *uap;
@@ -2455,7 +2458,7 @@
 	error = kern_stat(td, uap->path, UIO_USERSPACE, &sb);
 	if (error)
 		return (error);
-	cvtnstat(&sb, &nsb);
+	freebsd8_cvtnstat(&sb, &nsb);
 	error = copyout(&nsb, uap->ub, sizeof (nsb));
 	return (error);
 }
@@ -2464,15 +2467,15 @@
  * NetBSD lstat.  Get file status; this version does not follow links.
  */
 #ifndef _SYS_SYSPROTO_H_
-struct lstat_args {
+struct freebsd8_nlstat_args {
 	char	*path;
 	struct stat *ub;
 };
 #endif
 int
-nlstat(td, uap)
+freebsd8_nlstat(td, uap)
 	struct thread *td;
-	register struct nlstat_args /* {
+	register struct freebsd8_nlstat_args /* {
 		char *path;
 		struct nstat *ub;
 	} */ *uap;
@@ -2484,10 +2487,11 @@
 	error = kern_lstat(td, uap->path, UIO_USERSPACE, &sb);
 	if (error)
 		return (error);
-	cvtnstat(&sb, &nsb);
+	freebsd8_cvtnstat(&sb, &nsb);
 	error = copyout(&nsb, uap->ub, sizeof (nsb));
 	return (error);
 }
+#endif /* COMPAT_FREEBSD8 */
 
 /*
  * Get configurable pathname variables.

Modified: soc2011/gk/ino64-head/sys/sys/vnode.h
==============================================================================
--- soc2011/gk/ino64-head/sys/sys/vnode.h	Fri Jun 10 20:55:37 2011	(r223087)
+++ soc2011/gk/ino64-head/sys/sys/vnode.h	Fri Jun 10 20:55:53 2011	(r223088)
@@ -589,7 +589,7 @@
 int	change_dir(struct vnode *vp, struct thread *td);
 int	change_root(struct vnode *vp, struct thread *td);
 void	cvtstat(struct stat *st, struct ostat *ost);
-void	cvtnstat(struct stat *sb, struct nstat *nsb);
+void	freebsd8_cvtnstat(struct stat *sb, struct nstat *nsb);
 int	getnewvnode(const char *tag, struct mount *mp, struct vop_vector *vops,
 	    struct vnode **vpp);
 int	insmntque1(struct vnode *vp, struct mount *mp,

From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 10 20:56:11 2011
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 2975C1065680
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Jun 2011 20:56:09 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Jun 2011 20:56:09 +0000
Date: Fri, 10 Jun 2011 20:56:09 +0000
From: gk@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20110610205609.2975C1065680@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r223089 - in soc2011/gk/ino64-head/sys:
	compat/freebsd32 kern sys
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2011 20:56:11 -0000

Author: gk
Date: Fri Jun 10 20:56:08 2011
New Revision: 223089
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223089

Log:
  Regen

Modified:
  soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h
  soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h
  soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c
  soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c
  soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c
  soc2011/gk/ino64-head/sys/kern/init_sysent.c
  soc2011/gk/ino64-head/sys/kern/syscalls.c
  soc2011/gk/ino64-head/sys/kern/systrace_args.c
  soc2011/gk/ino64-head/sys/sys/syscall.h
  soc2011/gk/ino64-head/sys/sys/syscall.mk
  soc2011/gk/ino64-head/sys/sys/sysproto.h

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h	Fri Jun 10 20:56:08 2011	(r223089)
@@ -921,6 +921,21 @@
 
 #endif /* COMPAT_FREEBSD7 */
 
+
+#ifdef COMPAT_FREEBSD8
+
+#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
+#define PAD64_REQUIRED
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+
+#endif /* COMPAT_FREEBSD8 */
+
 #define	FREEBSD32_SYS_AUE_freebsd32_wait4	AUE_WAIT4
 #define	FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat	AUE_GETFSSTAT
 #define	FREEBSD32_SYS_AUE_freebsd32_recvmsg	AUE_RECVMSG

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h	Fri Jun 10 20:56:08 2011	(r223089)
@@ -220,9 +220,9 @@
 #define	FREEBSD32_SYS_netbsd_lchown	275
 #define	FREEBSD32_SYS_freebsd32_lutimes	276
 #define	FREEBSD32_SYS_netbsd_msync	277
-#define	FREEBSD32_SYS_nstat	278
-#define	FREEBSD32_SYS_nfstat	279
-#define	FREEBSD32_SYS_nlstat	280
+				/* 278 is obsolete nstat */
+				/* 279 is obsolete nfstat */
+				/* 280 is obsolete nlstat */
 #define	FREEBSD32_SYS_freebsd32_preadv	289
 #define	FREEBSD32_SYS_freebsd32_pwritev	290
 #define	FREEBSD32_SYS_freebsd4_freebsd32_fhstatfs	297

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c	Fri Jun 10 20:56:08 2011	(r223089)
@@ -288,9 +288,9 @@
 	"netbsd_lchown",			/* 275 = netbsd_lchown */
 	"freebsd32_lutimes",			/* 276 = freebsd32_lutimes */
 	"netbsd_msync",			/* 277 = netbsd_msync */
-	"nstat",			/* 278 = nstat */
-	"nfstat",			/* 279 = nfstat */
-	"nlstat",			/* 280 = nlstat */
+	"obs_nstat",			/* 278 = obsolete nstat */
+	"obs_nfstat",			/* 279 = obsolete nfstat */
+	"obs_nlstat",			/* 280 = obsolete nlstat */
 	"#281",			/* 281 = nosys */
 	"#282",			/* 282 = nosys */
 	"#283",			/* 283 = nosys */

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c	Fri Jun 10 20:56:08 2011	(r223089)
@@ -325,9 +325,9 @@
 	{ AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 275 = netbsd_lchown */
 	{ AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC },	/* 276 = freebsd32_lutimes */
 	{ AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0, SY_THR_STATIC },	/* 277 = netbsd_msync */
-	{ AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 278 = nstat */
-	{ AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 279 = nfstat */
-	{ AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 280 = nlstat */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 278 = obsolete nstat */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 279 = obsolete nfstat */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 280 = obsolete nlstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 281 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 282 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 283 = nosys */

Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c	Fri Jun 10 20:56:08 2011	(r223089)
@@ -1309,30 +1309,6 @@
 		*n_args = 3;
 		break;
 	}
-	/* nstat */
-	case 278: {
-		struct nstat_args *p = params;
-		uarg[0] = (intptr_t) p->path; /* char * */
-		uarg[1] = (intptr_t) p->ub; /* struct nstat * */
-		*n_args = 2;
-		break;
-	}
-	/* nfstat */
-	case 279: {
-		struct nfstat_args *p = params;
-		iarg[0] = p->fd; /* int */
-		uarg[1] = (intptr_t) p->sb; /* struct nstat * */
-		*n_args = 2;
-		break;
-	}
-	/* nlstat */
-	case 280: {
-		struct nlstat_args *p = params;
-		uarg[0] = (intptr_t) p->path; /* char * */
-		uarg[1] = (intptr_t) p->ub; /* struct nstat * */
-		*n_args = 2;
-		break;
-	}
 	/* freebsd32_preadv */
 	case 289: {
 		struct freebsd32_preadv_args *p = params;
@@ -5086,45 +5062,6 @@
 			break;
 		};
 		break;
-	/* nstat */
-	case 278:
-		switch(ndx) {
-		case 0:
-			p = "char *";
-			break;
-		case 1:
-			p = "struct nstat *";
-			break;
-		default:
-			break;
-		};
-		break;
-	/* nfstat */
-	case 279:
-		switch(ndx) {
-		case 0:
-			p = "int";
-			break;
-		case 1:
-			p = "struct nstat *";
-			break;
-		default:
-			break;
-		};
-		break;
-	/* nlstat */
-	case 280:
-		switch(ndx) {
-		case 0:
-			p = "char *";
-			break;
-		case 1:
-			p = "struct nstat *";
-			break;
-		default:
-			break;
-		};
-		break;
 	/* freebsd32_preadv */
 	case 289:
 		switch(ndx) {

Modified: soc2011/gk/ino64-head/sys/kern/init_sysent.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/init_sysent.c	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/kern/init_sysent.c	Fri Jun 10 20:56:08 2011	(r223089)
@@ -32,6 +32,12 @@
 #define compat7(n, name) 0, (sy_call_t *)nosys
 #endif
 
+#ifdef COMPAT_FREEBSD8
+#define compat8(n, name) n, (sy_call_t *)__CONCAT(freebsd8_,name)
+#else
+#define compat8(n, name) 0, (sy_call_t *)nosys
+#endif
+
 /* The casts are bogus but will do for now. */
 struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },		/* 0 = syscall */
@@ -312,9 +318,9 @@
 	{ AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC },	/* 275 = netbsd_lchown */
 	{ AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC },	/* 276 = lutimes */
 	{ AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 277 = netbsd_msync */
-	{ AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 278 = nstat */
-	{ AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 279 = nfstat */
-	{ AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 280 = nlstat */
+	{ compat8(AS(freebsd8_nstat_args),nstat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 278 = freebsd8 nstat */
+	{ compat8(AS(freebsd8_nfstat_args),nfstat), AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 279 = freebsd8 nfstat */
+	{ compat8(AS(freebsd8_nlstat_args),nlstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 280 = freebsd8 nlstat */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 281 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 282 = nosys */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 283 = nosys */

Modified: soc2011/gk/ino64-head/sys/kern/syscalls.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/syscalls.c	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/kern/syscalls.c	Fri Jun 10 20:56:08 2011	(r223089)
@@ -285,9 +285,9 @@
 	"netbsd_lchown",			/* 275 = netbsd_lchown */
 	"lutimes",			/* 276 = lutimes */
 	"netbsd_msync",			/* 277 = netbsd_msync */
-	"nstat",			/* 278 = nstat */
-	"nfstat",			/* 279 = nfstat */
-	"nlstat",			/* 280 = nlstat */
+	"compat8.nstat",		/* 278 = freebsd8 nstat */
+	"compat8.nfstat",		/* 279 = freebsd8 nfstat */
+	"compat8.nlstat",		/* 280 = freebsd8 nlstat */
 	"#281",			/* 281 = nosys */
 	"#282",			/* 282 = nosys */
 	"#283",			/* 283 = nosys */

Modified: soc2011/gk/ino64-head/sys/kern/systrace_args.c
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/systrace_args.c	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/kern/systrace_args.c	Fri Jun 10 20:56:08 2011	(r223089)
@@ -1450,30 +1450,6 @@
 		*n_args = 3;
 		break;
 	}
-	/* nstat */
-	case 278: {
-		struct nstat_args *p = params;
-		uarg[0] = (intptr_t) p->path; /* char * */
-		uarg[1] = (intptr_t) p->ub; /* struct nstat * */
-		*n_args = 2;
-		break;
-	}
-	/* nfstat */
-	case 279: {
-		struct nfstat_args *p = params;
-		iarg[0] = p->fd; /* int */
-		uarg[1] = (intptr_t) p->sb; /* struct nstat * */
-		*n_args = 2;
-		break;
-	}
-	/* nlstat */
-	case 280: {
-		struct nlstat_args *p = params;
-		uarg[0] = (intptr_t) p->path; /* char * */
-		uarg[1] = (intptr_t) p->ub; /* struct nstat * */
-		*n_args = 2;
-		break;
-	}
 	/* preadv */
 	case 289: {
 		struct preadv_args *p = params;
@@ -5515,45 +5491,6 @@
 			break;
 		};
 		break;
-	/* nstat */
-	case 278:
-		switch(ndx) {
-		case 0:
-			p = "char *";
-			break;
-		case 1:
-			p = "struct nstat *";
-			break;
-		default:
-			break;
-		};
-		break;
-	/* nfstat */
-	case 279:
-		switch(ndx) {
-		case 0:
-			p = "int";
-			break;
-		case 1:
-			p = "struct nstat *";
-			break;
-		default:
-			break;
-		};
-		break;
-	/* nlstat */
-	case 280:
-		switch(ndx) {
-		case 0:
-			p = "char *";
-			break;
-		case 1:
-			p = "struct nstat *";
-			break;
-		default:
-			break;
-		};
-		break;
 	/* preadv */
 	case 289:
 		switch(ndx) {

Modified: soc2011/gk/ino64-head/sys/sys/syscall.h
==============================================================================
--- soc2011/gk/ino64-head/sys/sys/syscall.h	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/sys/syscall.h	Fri Jun 10 20:56:08 2011	(r223089)
@@ -230,9 +230,9 @@
 #define	SYS_netbsd_lchown	275
 #define	SYS_lutimes	276
 #define	SYS_netbsd_msync	277
-#define	SYS_nstat	278
-#define	SYS_nfstat	279
-#define	SYS_nlstat	280
+#define	SYS_freebsd8_nstat	278
+#define	SYS_freebsd8_nfstat	279
+#define	SYS_freebsd8_nlstat	280
 #define	SYS_preadv	289
 #define	SYS_pwritev	290
 #define	SYS_freebsd4_fhstatfs	297

Modified: soc2011/gk/ino64-head/sys/sys/syscall.mk
==============================================================================
--- soc2011/gk/ino64-head/sys/sys/syscall.mk	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/sys/syscall.mk	Fri Jun 10 20:56:08 2011	(r223089)
@@ -182,9 +182,9 @@
 	netbsd_lchown.o \
 	lutimes.o \
 	netbsd_msync.o \
-	nstat.o \
-	nfstat.o \
-	nlstat.o \
+	freebsd8_nstat.o \
+	freebsd8_nfstat.o \
+	freebsd8_nlstat.o \
 	preadv.o \
 	pwritev.o \
 	freebsd4_fhstatfs.o \

Modified: soc2011/gk/ino64-head/sys/sys/sysproto.h
==============================================================================
--- soc2011/gk/ino64-head/sys/sys/sysproto.h	Fri Jun 10 20:55:53 2011	(r223088)
+++ soc2011/gk/ino64-head/sys/sys/sysproto.h	Fri Jun 10 20:56:08 2011	(r223089)
@@ -775,18 +775,6 @@
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)];
 };
-struct nstat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)];
-};
-struct nfstat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char sb_l_[PADL_(struct nstat *)]; struct nstat * sb; char sb_r_[PADR_(struct nstat *)];
-};
-struct nlstat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)];
-};
 struct preadv_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
@@ -1880,9 +1868,6 @@
 int	getdents(struct thread *, struct getdents_args *);
 int	lchmod(struct thread *, struct lchmod_args *);
 int	lutimes(struct thread *, struct lutimes_args *);
-int	nstat(struct thread *, struct nstat_args *);
-int	nfstat(struct thread *, struct nfstat_args *);
-int	nlstat(struct thread *, struct nlstat_args *);
 int	preadv(struct thread *, struct preadv_args *);
 int	pwritev(struct thread *, struct pwritev_args *);
 int	fhopen(struct thread *, struct fhopen_args *);
@@ -2348,6 +2333,27 @@
 
 #endif /* COMPAT_FREEBSD7 */
 
+
+#ifdef COMPAT_FREEBSD8
+
+struct freebsd8_nstat_args {
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)];
+};
+struct freebsd8_nfstat_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char sb_l_[PADL_(struct nstat *)]; struct nstat * sb; char sb_r_[PADR_(struct nstat *)];
+};
+struct freebsd8_nlstat_args {
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)];
+};
+int	freebsd8_nstat(struct thread *, struct freebsd8_nstat_args *);
+int	freebsd8_nfstat(struct thread *, struct freebsd8_nfstat_args *);
+int	freebsd8_nlstat(struct thread *, struct freebsd8_nlstat_args *);
+
+#endif /* COMPAT_FREEBSD8 */
+
 #define	SYS_AUE_syscall	AUE_NULL
 #define	SYS_AUE_exit	AUE_EXIT
 #define	SYS_AUE_fork	AUE_FORK
@@ -2561,9 +2567,9 @@
 #define	SYS_AUE_getdents	AUE_O_GETDENTS
 #define	SYS_AUE_lchmod	AUE_LCHMOD
 #define	SYS_AUE_lutimes	AUE_LUTIMES
-#define	SYS_AUE_nstat	AUE_STAT
-#define	SYS_AUE_nfstat	AUE_FSTAT
-#define	SYS_AUE_nlstat	AUE_LSTAT
+#define	SYS_AUE_freebsd8_nstat	AUE_STAT
+#define	SYS_AUE_freebsd8_nfstat	AUE_FSTAT
+#define	SYS_AUE_freebsd8_nlstat	AUE_LSTAT
 #define	SYS_AUE_preadv	AUE_PREADV
 #define	SYS_AUE_pwritev	AUE_PWRITEV
 #define	SYS_AUE_freebsd4_fhstatfs	AUE_FHSTATFS