From owner-p4-projects@FreeBSD.ORG  Sat Oct 20 23:34:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 982BF16A421; Sat, 20 Oct 2007 23:34:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 558F116A420
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:34:13 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D3FFC13C467
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:34:06 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KNY6cG074490
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:34:06 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KNY6Ta074487
	for perforce@freebsd.org; Sat, 20 Oct 2007 23:34:06 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 20 Oct 2007 23:34:06 GMT
Message-Id: <200710202334.l9KNY6Ta074487@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127861 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Oct 2007 23:34:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=127861

Change 127861 by jb@jb_freebsd1 on 2007/10/20 23:33:51

	Fix a clash between my p4 additions and what came through
	current, then propagate the change to RELENG_6.

Affected files ...

.. //depot/projects/dtrace/src/include/unistd.h#6 edit
.. //depot/projects/dtrace6/src/include/unistd.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/include/unistd.h#6 (text+ko) ====

@@ -292,12 +292,12 @@
 #if __BSD_VISIBLE
 #define	_SC_NPROCESSORS_CONF	57
 #define	_SC_NPROCESSORS_ONLN	58
-#define	_SC_NPROCESSORS_MAX	121
-#define	_SC_CPUID_MAX		122
 #endif
 
 /* Extensions found in Solaris and Linux. */
 #define	_SC_PHYS_PAGES		121
+#define	_SC_NPROCESSORS_MAX	122
+#define	_SC_CPUID_MAX		123
 
 /* Keys for the confstr(3) function. */
 #if __POSIX_VISIBLE >= 199209

==== //depot/projects/dtrace6/src/include/unistd.h#2 (text+ko) ====

@@ -294,6 +294,11 @@
 #define	_SC_NPROCESSORS_ONLN	58
 #endif
 
+/* Extensions found in Solaris and Linux. */
+#define	_SC_PHYS_PAGES		121
+#define	_SC_NPROCESSORS_MAX	122
+#define	_SC_CPUID_MAX		123
+
 /* Keys for the confstr(3) function. */
 #if __POSIX_VISIBLE >= 199209
 #define	_CS_PATH		1	/* default value of PATH */