From owner-svn-src-stable@FreeBSD.ORG  Sun Mar 22 20:52:43 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB5421065670;
	Sun, 22 Mar 2009 20:52:43 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A7EC58FC25;
	Sun, 22 Mar 2009 20:52:43 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2MKqhSQ083145;
	Sun, 22 Mar 2009 20:52:43 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2MKqhbk083144;
	Sun, 22 Mar 2009 20:52:43 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200903222052.n2MKqhbk083144@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 22 Mar 2009 20:52:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190279 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb sys
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Mar 2009 20:52:45 -0000

Author: marius
Date: Sun Mar 22 20:52:43 2009
New Revision: 190279
URL: http://svn.freebsd.org/changeset/base/190279

Log:
  MFC: r188475
  
  o Introduce KOBJMETHOD_END for the end of the kobj list.
  o Fix a minor indentation problem.
  o Put in the extra-strict KOBJMETHOD define, but commented out since
    the tree isn't yet ready.
  
  Reviewed by:	(1) was posted to arch@ without objection (and 1 go for it)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/sys/kobj.h

Modified: stable/7/sys/sys/kobj.h
==============================================================================
--- stable/7/sys/sys/kobj.h	Sun Mar 22 20:50:45 2009	(r190278)
+++ stable/7/sys/sys/kobj.h	Sun Mar 22 20:52:43 2009	(r190279)
@@ -92,7 +92,17 @@ struct kobjop_desc {
 /*
  * Shorthand for constructing method tables.
  */
+#if 1
 #define KOBJMETHOD(NAME, FUNC) { &NAME##_desc, (kobjop_t) FUNC }
+#else /* notyet */
+#define KOBJMETHOD(NAME, FUNC) \
+{ &NAME##_desc, (kobjop_t) (FUNC != (NAME##_t *)NULL ? FUNC : NULL) }
+#endif
+
+/*
+ *
+ */
+#define KOBJMETHOD_END	{ NULL, NULL }
 
 /*
  * Declare a class (which should be defined in another file.
@@ -127,7 +137,7 @@ struct kobj_class classvar = {				\
 		       base1)				\
 							\
 static kobj_class_t name ## _baseclasses[] =		\
-	{ &base1, NULL };					\
+	{ &base1, NULL };				\
 struct kobj_class classvar = {				\
 	#name, methods, size, name ## _baseclasses	\
 }