[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/b523badf65d2
changeset: 391:b523badf65d2
user:      ray at terran.dlink.ua
date:      Fri Mar 02 17:14:30 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/sys/pc98/conf/GENERIC      |  21 ++++-----------------
 head/sys/pc98/include/_limits.h |   4 ++--
 head/sys/pc98/include/_stdint.h |   4 ++--
 head/sys/pc98/include/_types.h  |   4 ++--
 head/sys/pc98/include/endian.h  |   4 ++--
 head/sys/pc98/include/setjmp.h  |   4 ++--
 head/sys/pc98/include/stdarg.h  |   4 ++--
 7 files changed, 16 insertions(+), 29 deletions(-)

diffs (117 lines):

diff -r 184bff40393f -r b523badf65d2 head/sys/pc98/conf/GENERIC
--- a/head/sys/pc98/conf/GENERIC	Fri Mar 02 17:14:20 2012 +0200
+++ b/head/sys/pc98/conf/GENERIC	Fri Mar 02 17:14:30 2012 +0200
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: head/sys/pc98/conf/GENERIC 229691 2012-01-06 08:51:20Z adrian $
+# $FreeBSD: head/sys/pc98/conf/GENERIC 231276 2012-02-09 14:15:56Z nyan $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -67,20 +67,8 @@
 options 	CAPABILITIES		# Capsicum capabilities
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-
-# Debugging support.  Always need this:
-options 	KDB			# Enable kernel debugger support.
-# For minimum debugger support (stable branch) use:
-#options 	KDB_TRACE		# Print a stack trace for a panic.
-# For full debugger support use this instead:
-options 	DDB			# Support DDB.
-options 	GDB			# Support remote GDB.
-options 	DEADLKRES		# Enable the deadlock resolver
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
+options 	KDB			# Kernel debugger related code
+options 	KDB_TRACE		# Print a stack trace for a panic
 
 # To make an SMP kernel, the next two lines are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -167,8 +155,7 @@
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 # OLD Parallel port
-# Please stay olpt driver after ppc driver
-device		olpt
+#device		olpt
 
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
diff -r 184bff40393f -r b523badf65d2 head/sys/pc98/include/_limits.h
--- a/head/sys/pc98/include/_limits.h	Fri Mar 02 17:14:20 2012 +0200
+++ b/head/sys/pc98/include/_limits.h	Fri Mar 02 17:14:30 2012 +0200
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/pc98/include/_limits.h 232262 2012-02-28 18:24:28Z tijl $ */
 
-#include <i386/_limits.h>
+#include <x86/_limits.h>
diff -r 184bff40393f -r b523badf65d2 head/sys/pc98/include/_stdint.h
--- a/head/sys/pc98/include/_stdint.h	Fri Mar 02 17:14:20 2012 +0200
+++ b/head/sys/pc98/include/_stdint.h	Fri Mar 02 17:14:30 2012 +0200
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/pc98/include/_stdint.h 232264 2012-02-28 18:38:33Z tijl $ */
 
-#include <i386/_stdint.h>
+#include <x86/_stdint.h>
diff -r 184bff40393f -r b523badf65d2 head/sys/pc98/include/_types.h
--- a/head/sys/pc98/include/_types.h	Fri Mar 02 17:14:20 2012 +0200
+++ b/head/sys/pc98/include/_types.h	Fri Mar 02 17:14:30 2012 +0200
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/pc98/include/_types.h 232261 2012-02-28 18:15:28Z tijl $ */
 
-#include <i386/_types.h>
+#include <x86/_types.h>
diff -r 184bff40393f -r b523badf65d2 head/sys/pc98/include/endian.h
--- a/head/sys/pc98/include/endian.h	Fri Mar 02 17:14:20 2012 +0200
+++ b/head/sys/pc98/include/endian.h	Fri Mar 02 17:14:30 2012 +0200
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/pc98/include/endian.h 232266 2012-02-28 19:39:54Z tijl $ */
 
-#include <i386/endian.h>
+#include <x86/endian.h>
diff -r 184bff40393f -r b523badf65d2 head/sys/pc98/include/setjmp.h
--- a/head/sys/pc98/include/setjmp.h	Fri Mar 02 17:14:20 2012 +0200
+++ b/head/sys/pc98/include/setjmp.h	Fri Mar 02 17:14:30 2012 +0200
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/pc98/include/setjmp.h 232275 2012-02-28 22:17:52Z tijl $ */
 
-#include <i386/setjmp.h>
+#include <x86/setjmp.h>
diff -r 184bff40393f -r b523badf65d2 head/sys/pc98/include/stdarg.h
--- a/head/sys/pc98/include/stdarg.h	Fri Mar 02 17:14:20 2012 +0200
+++ b/head/sys/pc98/include/stdarg.h	Fri Mar 02 17:14:30 2012 +0200
@@ -1,6 +1,6 @@
 /*-
  * This file is in the public domain.
  */
-/* $FreeBSD$ */
+/* $FreeBSD: head/sys/pc98/include/stdarg.h 232276 2012-02-28 22:30:58Z tijl $ */
 
-#include <i386/stdarg.h>
+#include <x86/stdarg.h>