From owner-svn-src-stable@FreeBSD.ORG  Tue Jun  5 19:59:02 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CDEFD106566B;
	Tue,  5 Jun 2012 19:59:02 +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 B97098FC08;
	Tue,  5 Jun 2012 19:59:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q55Jx23M040736;
	Tue, 5 Jun 2012 19:59:02 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q55Jx2jT040733;
	Tue, 5 Jun 2012 19:59:02 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201206051959.q55Jx2jT040733@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 5 Jun 2012 19:59:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236632 - in stable/8/sys: dev/iwn 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: Tue, 05 Jun 2012 19:59:02 -0000

Author: marius
Date: Tue Jun  5 19:59:02 2012
New Revision: 236632
URL: http://svn.freebsd.org/changeset/base/236632

Log:
  MFC: r236486
  
  Add nitems(), a macro for determining the number of elements in a
  statically-allocated array.
  
  Obtained from:	OpenBSD (in principle)
  
  MFC: r236489

Modified:
  stable/8/sys/dev/iwn/if_iwn.c
  stable/8/sys/sys/param.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/e1000/   (props changed)

Modified: stable/8/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/8/sys/dev/iwn/if_iwn.c	Tue Jun  5 19:58:58 2012	(r236631)
+++ stable/8/sys/dev/iwn/if_iwn.c	Tue Jun  5 19:59:02 2012	(r236632)
@@ -2010,8 +2010,6 @@ iwn_setregdomain(struct ieee80211com *ic
 	return 0;
 }
 
-#define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
-
 static void
 iwn_read_eeprom_enhinfo(struct iwn_softc *sc)
 {

Modified: stable/8/sys/sys/param.h
==============================================================================
--- stable/8/sys/sys/param.h	Tue Jun  5 19:58:58 2012	(r236631)
+++ stable/8/sys/sys/param.h	Tue Jun  5 19:59:02 2012	(r236632)
@@ -271,6 +271,7 @@
 #ifndef howmany
 #define	howmany(x, y)	(((x)+((y)-1))/(y))
 #endif
+#define	nitems(x)	(sizeof((x)) / sizeof((x)[0]))
 #define	rounddown(x, y)	(((x)/(y))*(y))
 #define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
 #define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */