PERFORCE change 135529 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Feb 16 14:50:59 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=135529
Change 135529 by marcel at marcel_xcllnt on 2008/02/16 22:50:43
IFC @135528
Affected files ...
.. //depot/projects/e500/lib/libc/resolv/res_comp.c#3 integrate
.. //depot/projects/e500/lib/libdisk/disk.c#2 integrate
.. //depot/projects/e500/lib/libthr/thread/thr_mutex.c#7 integrate
.. //depot/projects/e500/lib/msun/src/e_hypot.c#2 integrate
.. //depot/projects/e500/lib/msun/src/e_hypotf.c#2 integrate
.. //depot/projects/e500/lib/msun/src/e_pow.c#2 integrate
.. //depot/projects/e500/lib/msun/src/e_powf.c#2 integrate
.. //depot/projects/e500/lib/msun/src/s_ceil.c#2 integrate
.. //depot/projects/e500/lib/msun/src/s_ceill.c#3 integrate
.. //depot/projects/e500/lib/msun/src/s_floor.c#2 integrate
.. //depot/projects/e500/lib/msun/src/s_floorl.c#3 integrate
.. //depot/projects/e500/lib/msun/src/s_trunc.c#2 integrate
.. //depot/projects/e500/lib/msun/src/s_truncl.c#3 integrate
.. //depot/projects/e500/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate
.. //depot/projects/e500/share/man/man4/sk.4#2 integrate
.. //depot/projects/e500/share/man/man9/lock.9#5 integrate
.. //depot/projects/e500/share/man/man9/pci.9#3 integrate
.. //depot/projects/e500/share/misc/committers-src.dot#7 integrate
.. //depot/projects/e500/sys/amd64/amd64/dump_machdep.c#3 integrate
.. //depot/projects/e500/sys/amd64/amd64/minidump_machdep.c#3 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#6 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#3 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/help.uboot#2 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/ldscript.powerpc#2 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#3 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#4 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/version#3 integrate
.. //depot/projects/e500/sys/boot/uboot/Makefile#2 integrate
.. //depot/projects/e500/sys/boot/uboot/common/Makefile.inc#2 integrate
.. //depot/projects/e500/sys/boot/uboot/common/main.c#4 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/Makefile#7 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/api_public.h#2 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/console.c#3 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/copy.c#2 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/devicename.c#3 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/disk.c#2 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/elf_freebsd.c#2 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/glue.c#3 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#3 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/module.c#2 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/net.c#3 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/reboot.c#3 integrate
.. //depot/projects/e500/sys/boot/uboot/lib/time.c#3 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_cpu.c#6 integrate
.. //depot/projects/e500/sys/dev/acpica/acpi_thermal.c#4 integrate
.. //depot/projects/e500/sys/dev/coretemp/coretemp.c#4 integrate
.. //depot/projects/e500/sys/dev/mxge/if_mxge.c#9 integrate
.. //depot/projects/e500/sys/dev/mxge/if_mxge_var.h#7 integrate
.. //depot/projects/e500/sys/fs/coda/cnode.h#4 integrate
.. //depot/projects/e500/sys/fs/coda/coda_psdev.c#4 integrate
.. //depot/projects/e500/sys/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/e500/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/e500/sys/i386/i386/dump_machdep.c#3 integrate
.. //depot/projects/e500/sys/i386/i386/minidump_machdep.c#3 integrate
.. //depot/projects/e500/sys/ia64/conf/GENERIC#7 integrate
.. //depot/projects/e500/sys/ia64/ia64/machdep.c#9 integrate
.. //depot/projects/e500/sys/ia64/ia64/pmap.c#8 integrate
.. //depot/projects/e500/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/e500/sys/kern/kern_lock.c#6 integrate
.. //depot/projects/e500/sys/kern/subr_autoconf.c#2 integrate
.. //depot/projects/e500/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/e500/sys/kern/vfs_default.c#5 integrate
.. //depot/projects/e500/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/e500/sys/powerpc/conf/GENERIC#9 integrate
.. //depot/projects/e500/sys/sys/buf.h#4 integrate
.. //depot/projects/e500/sys/sys/conf.h#5 integrate
.. //depot/projects/e500/sys/sys/lockmgr.h#5 integrate
.. //depot/projects/e500/sys/sys/param.h#9 integrate
.. //depot/projects/e500/sys/sys/priv.h#6 integrate
.. //depot/projects/e500/sys/ufs/ffs/ffs_vnops.c#7 integrate
.. //depot/projects/e500/tools/regression/security/open_to_operation/Makefile#1 branch
.. //depot/projects/e500/tools/regression/security/open_to_operation/open_to_operation.c#1 branch
.. //depot/projects/e500/usr.bin/netstat/route.c#5 integrate
.. //depot/projects/e500/usr.sbin/rpcbind/rpcbind.c#5 integrate
Differences ...
==== //depot/projects/e500/lib/libc/resolv/res_comp.c#3 (text) ====
@@ -69,7 +69,7 @@
static const char rcsid[] = "$Id: res_comp.c,v 1.3.18.2 2005/07/28 07:38:11 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.4 2007/06/03 17:20:27 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.5 2008/02/16 00:16:49 delphij Exp $");
#include "port_before.h"
#include <sys/types.h>
@@ -140,6 +140,7 @@
#define PERIOD 0x2e
#define hyphenchar(c) ((c) == 0x2d)
#define bslashchar(c) ((c) == 0x5c)
+#define underscorechar(c) ((c) == 0x5f)
#define periodchar(c) ((c) == PERIOD)
#define asterchar(c) ((c) == 0x2a)
#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
@@ -147,7 +148,7 @@
#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
+#define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c))
#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)
int
==== //depot/projects/e500/lib/libdisk/disk.c#2 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.127 2006/04/25 20:42:15 maxim Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.128 2008/02/15 21:19:15 antoine Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -189,10 +189,10 @@
Disk_Names()
{
int disk_cnt;
- static char **disks;
+ char **disks;
int error;
size_t listsize;
- char *disklist;
+ char *disklist, *disk1, *disk2;
error = sysctlbyname("kern.disks", NULL, &listsize, NULL, 0);
if (error) {
@@ -206,7 +206,7 @@
disks = malloc(sizeof *disks * (1 + MAX_NO_DISKS));
if (disks == NULL)
return NULL;
- disklist = (char *)malloc(listsize + 1);
+ disk1 = disklist = (char *)malloc(listsize + 1);
if (disklist == NULL) {
free(disks);
return NULL;
@@ -220,11 +220,20 @@
return NULL;
}
for (disk_cnt = 0; disk_cnt < MAX_NO_DISKS; disk_cnt++) {
- disks[disk_cnt] = strsep(&disklist, " ");
- if (disks[disk_cnt] == NULL)
+ disk2 = strsep(&disk1, " ");
+ if (disk2 == NULL)
break;
+ disks[disk_cnt] = strdup(disk2);
+ if (disks[disk_cnt] == NULL) {
+ for (disk_cnt--; disk_cnt >= 0; disk_cnt--)
+ free(disks[disk_cnt]);
+ free(disklist);
+ free(disks);
+ return (NULL);
+ }
}
qsort(disks, disk_cnt, sizeof(char*), qstrcmp);
+ free(disklist);
return disks;
}
==== //depot/projects/e500/lib/libthr/thread/thr_mutex.c#7 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.70 2008/02/06 20:43:19 des Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.71 2008/02/14 12:37:58 des Exp $
*/
#include "namespace.h"
@@ -876,5 +876,5 @@
if (__predict_false(ret))
return (ret);
}
- return ((*mutex)->m_lock.m_owner == TID(curthread));
+ return ((*mutex)->m_owner == curthread);
}
==== //depot/projects/e500/lib/msun/src/e_hypot.c#2 (text+ko) ====
@@ -11,9 +11,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.9 2005/02/04 18:26:05 das Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_hypot.c,v 1.10 2008/02/14 13:44:03 bde Exp $");
/* __ieee754_hypot(x,y)
*
@@ -68,7 +67,8 @@
if(ha > 0x5f300000) { /* a>2**500 */
if(ha >= 0x7ff00000) { /* Inf or NaN */
u_int32_t low;
- w = a+b; /* for sNaN */
+ /* Use original arg order iff result is NaN; quieten sNaNs. */
+ w = fabs(x+0.0)+fabs(y+0.0);
GET_LOW_WORD(low,a);
if(((ha&0xfffff)|low)==0) w = a;
GET_LOW_WORD(low,b);
==== //depot/projects/e500/lib/msun/src/e_hypotf.c#2 (text+ko) ====
@@ -13,9 +13,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.9 2002/05/28 18:15:03 alfred Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_hypotf.c,v 1.10 2008/02/14 13:44:03 bde Exp $");
#include "math.h"
#include "math_private.h"
@@ -37,7 +36,8 @@
k=0;
if(ha > 0x58800000) { /* a>2**50 */
if(ha >= 0x7f800000) { /* Inf or NaN */
- w = a+b; /* for sNaN */
+ /* Use original arg order iff result is NaN; quieten sNaNs. */
+ w = fabsf(x+0.0F)+fabsf(y+0.0F);
if(ha == 0x7f800000) w = a;
if(hb == 0x7f800000) w = b;
return w;
==== //depot/projects/e500/lib/msun/src/e_pow.c#2 (text+ko) ====
@@ -9,9 +9,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_pow.c,v 1.11 2005/02/04 18:26:06 das Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_pow.c,v 1.13 2008/02/14 12:56:35 bde Exp $");
/* __ieee754_pow(x,y) return x**y
*
@@ -110,10 +109,10 @@
/* y==zero: x**0 = 1 */
if((iy|ly)==0) return one;
- /* +-NaN return x+y */
+ /* y!=zero: result is NaN if either arg is NaN */
if(ix > 0x7ff00000 || ((ix==0x7ff00000)&&(lx!=0)) ||
iy > 0x7ff00000 || ((iy==0x7ff00000)&&(ly!=0)))
- return x+y;
+ return (x+0.0)+(y+0.0);
/* determine if y is an odd int when x < 0
* yisint = 0 ... y is not an integer
==== //depot/projects/e500/lib/msun/src/e_powf.c#2 (text+ko) ====
@@ -13,9 +13,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/e_powf.c,v 1.12 2004/06/01 19:33:30 bde Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/e_powf.c,v 1.15 2008/02/14 12:56:35 bde Exp $");
#include "math.h"
#include "math_private.h"
@@ -47,8 +46,8 @@
lg2_l = 1.42860654e-06, /* 0x35bfbe8c */
ovt = 4.2995665694e-08, /* -(128-log2(ovfl+.5ulp)) */
cp = 9.6179670095e-01, /* 0x3f76384f =2/(3ln2) */
-cp_h = 9.6179199219e-01, /* 0x3f763800 =head of cp */
-cp_l = 4.7017383622e-06, /* 0x369dc3a0 =tail of cp_h */
+cp_h = 9.6191406250e-01, /* 0x3f764000 =12b cp */
+cp_l = -1.1736857402e-04, /* 0xb8f623c6 =tail of cp_h */
ivln2 = 1.4426950216e+00, /* 0x3fb8aa3b =1/ln2 */
ivln2_h = 1.4426879883e+00, /* 0x3fb8aa00 =16b 1/ln2*/
ivln2_l = 7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/
@@ -68,10 +67,10 @@
/* y==zero: x**0 = 1 */
if(iy==0) return one;
- /* +-NaN return x+y */
+ /* y!=zero: result is NaN if either arg is NaN */
if(ix > 0x7f800000 ||
iy > 0x7f800000)
- return x+y;
+ return (x+0.0F)+(y+0.0F);
/* determine if y is an odd int when x < 0
* yisint = 0 ... y is not an integer
==== //depot/projects/e500/lib/msun/src/s_ceil.c#2 (text+ko) ====
@@ -10,9 +10,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ceil.c,v 1.11 2008/02/15 07:01:40 bde Exp $");
/*
* ceil(x)
@@ -23,6 +22,8 @@
* Inexact flag raised if x not equal to ceil(x).
*/
+#include <float.h>
+
#include "math.h"
#include "math_private.h"
@@ -70,3 +71,7 @@
INSERT_WORDS(x,i0,i1);
return x;
}
+
+#if LDBL_MANT_DIG == 53
+__weak_reference(ceil, ceill);
+#endif
==== //depot/projects/e500/lib/msun/src/s_ceill.c#3 (text+ko) ====
@@ -12,7 +12,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.8 2008/02/13 18:16:43 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_ceill.c,v 1.9 2008/02/14 15:10:33 bde Exp $");
/*
* ceill(x)
@@ -99,7 +99,3 @@
}
return (u.e);
}
-
-#if LDBL_MANT_DIG == 53
-__weak_reference(ceil, ceill);
-#endif
==== //depot/projects/e500/lib/msun/src/s_floor.c#2 (text+ko) ====
@@ -10,9 +10,8 @@
* ====================================================
*/
-#ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_floor.c,v 1.9 2003/07/23 04:53:46 peter Exp $";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/lib/msun/src/s_floor.c,v 1.11 2008/02/15 07:01:40 bde Exp $");
/*
* floor(x)
@@ -23,6 +22,8 @@
* Inexact flag raised if x not equal to floor(x).
*/
+#include <float.h>
+
#include "math.h"
#include "math_private.h"
@@ -71,3 +72,7 @@
INSERT_WORDS(x,i0,i1);
return x;
}
+
+#if LDBL_MANT_DIG == 53
+__weak_reference(floor, floorl);
+#endif
==== //depot/projects/e500/lib/msun/src/s_floorl.c#3 (text+ko) ====
@@ -12,7 +12,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.7 2008/02/13 18:16:43 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_floorl.c,v 1.8 2008/02/14 15:10:34 bde Exp $");
/*
* floorl(x)
@@ -99,7 +99,3 @@
}
return (u.e);
}
-
-#if LDBL_MANT_DIG == 53
-__weak_reference(floor, floorl);
-#endif
==== //depot/projects/e500/lib/msun/src/s_trunc.c#2 (text+ko) ====
@@ -11,7 +11,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.1 2004/06/20 09:25:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_trunc.c,v 1.3 2008/02/15 07:01:40 bde Exp $");
/*
* trunc(x)
@@ -22,6 +22,8 @@
* Inexact flag raised if x not equal to trunc(x).
*/
+#include <float.h>
+
#include "math.h"
#include "math_private.h"
@@ -59,3 +61,7 @@
INSERT_WORDS(x,i0,i1);
return x;
}
+
+#if LDBL_MANT_DIG == 53
+__weak_reference(trunc, truncl);
+#endif
==== //depot/projects/e500/lib/msun/src/s_truncl.c#3 (text+ko) ====
@@ -12,7 +12,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.8 2008/02/13 18:16:43 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_truncl.c,v 1.9 2008/02/14 15:10:34 bde Exp $");
/*
* truncl(x)
@@ -66,7 +66,3 @@
}
return (u.e);
}
-
-#if LDBL_MANT_DIG == 53
-__weak_reference(trunc, truncl);
-#endif
==== //depot/projects/e500/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 (text+ko) ====
@@ -20,7 +20,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1078 2008/01/01 23:58:18 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1079 2008/02/16 15:52:39 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -229,6 +229,15 @@
<sect2 id="contrib">
<title>Contributed Software</title>
+ <para><application>AMD</application> has been updated from 6.0.10
+ to 6.1.5. &merged;</para>
+
+ <para><application>awk</application> has been updated from 1 May
+ 2007 release to the 23 October 2007 release. &merged;</para>
+
+ <para><application>CVS</application> has been updated from 1.11.17
+ to 1.11.22.</para>
+
<para><application>IPFilter</application> has been updated from
4.1.23 to 4.1.28.</para>
@@ -236,7 +245,10 @@
v408 to v416.</para>
<para><application>ncurses</application> has been updated from
- 5.6-20061217 to 5.6-20071222.</para>
+ 5.6-20061217 to 5.6-20080209.</para>
+
+ <para><application>OpenPAM</application> has been updated from the
+ Figwort release to the Hydrangea release. &merged;</para>
<para><application>sendmail</application> has been updated from
8.14.1 to 8.14.2. &merged;</para>
==== //depot/projects/e500/share/man/man4/sk.4#2 (text+ko) ====
@@ -28,9 +28,9 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/sk.4,v 1.30 2007/01/30 08:40:04 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/sk.4,v 1.31 2008/02/14 10:01:48 brueffer Exp $
.\"
-.Dd July 16, 2005
+.Dd February 14, 2008
.Dt SK 4
.Os
.Sh NAME
@@ -191,17 +191,28 @@
.It
SMC 9452TX single port, 1000baseT adapter
.El
+.Sh LOADER TUNABLES
+Tunables can be set at the
+.Xr loader 8
+prompt before booting the kernel or stored in
+.Xr loader.conf 5 .
+.Bl -tag -width xxxxxx
+.It Va hw.skc.jumbo_disable
+Disable jumbo frame support.
+Systems with less memory can set it to a non-zero value to save memory.
+The default value is 0.
+.El
.Sh SYSCTL VARIABLES
The following variable is available as both
.Xr sysctl 8
variable and
.Xr loader 8
tunable:
-.Bl -tag -width indent
+.Bl -tag -width xxxxxx
.It Va dev.skc.%d.int_mod
-.Pp
This variable controls interrupt moderation.
-The accepted range is 10 to 10000, default value is 100 microseconds.
+The accepted range is 10 to 10000.
+The default value is 100 microseconds.
The interface has to be brought down and up again before a change takes effect.
.El
.Sh DIAGNOSTICS
==== //depot/projects/e500/share/man/man9/lock.9#5 (text+ko) ====
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.24 2008/02/13 21:54:16 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.25 2008/02/14 19:39:09 brueffer Exp $
.\"
.Dd February 13, 2008
.Dt LOCK 9
@@ -239,7 +239,7 @@
.Vt lkp
lock pointed to by the first argument.
.It Dv KA_HELD
-Assert that the a not specified thread has a lock on the
+Assert that an unspecified thread has a lock on the
.Vt lkp
lock pointed to by the first argument.
.It Dv KA_UNHELD
@@ -260,16 +260,18 @@
Assert that the current thread has a recursed lock on
.Fa lkp .
.It Dv KA_NOTRECURSED
-Assert that the current thread has not a recursed lock on
+Assert that the current thread does not have a recursed lock on
.Fa lkp .
.El
.Pp
-It also worths note that
+Note that
.Dv KA_HELD
and
.Dv KA_UNHELD
-usage is highly discouraged. They are intended to cater a bad behaviour
-introduced by buffer cache locks handling and hopefully they will be
+usage is highly discouraged.
+They are intended to cater a bad behaviour
+introduced by buffer cache lock handling.
+They will hopefully be
made useless by revisiting such locks.
.Sh RETURN VALUES
The
==== //depot/projects/e500/share/man/man9/pci.9#3 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/pci.9,v 1.10 2007/09/30 11:05:13 marius Exp $
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.11 2008/02/15 23:56:33 danger Exp $
.\"
.Dd September 30, 2007
.Dt PCI 9
@@ -153,7 +153,7 @@
full functionality to the user.
.It Dv PCI_POWERSTATE_D1
Class-specific low-power state in which device context may or
-may not be lot.
+may not be lost.
Busses in this state cannot do anything to the bus, to
force devices to lose context.
.It Dv PCI_POWERSTATE_D2
==== //depot/projects/e500/share/misc/committers-src.dot#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-src.dot,v 1.71 2008/02/05 19:23:22 antoine Exp $
+# $FreeBSD: src/share/misc/committers-src.dot,v 1.72 2008/02/15 18:40:45 olli Exp $
# This file is meant to list all FreeBSD src committers and describe the
# mentor-mentee relationships between them.
@@ -128,6 +128,7 @@
netchild [label="Alexander Leidinger\nnetchild at FreeBSD.org\n2005/03/31"]
njl [label="Nate Lawson\nnjl at FreeBSD.org\n2002/08/07"]
obrien [label="David E. O'Brien\nobrien at FreeBSD.org\n1996/10/29"]
+olli [label="Oliver Fromme\nolli at FreeBSD.org\n2008/02/14"]
onoe [label="Atsushi Onoe\nonoe at FreeBSD.org\n2000/07/21"]
peadar [label="Peter Edwards\npeadar at FreeBSD.org\n2004/03/08"]
peter [label="Peter Wemm\npeter at FreeBSD.org\n????/??/??"]
@@ -215,6 +216,7 @@
des -> anholt
des -> hmp
des -> mike
+des -> olli
des -> ru
dwmalone -> fanf
==== //depot/projects/e500/sys/amd64/amd64/dump_machdep.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.13 2008/01/28 19:04:06 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,6 +177,7 @@
uint64_t pgs;
size_t counter, sz, chunk;
int i, c, error, twiddle;
+ u_int maxdumppgs;
error = 0; /* catch case in which chunk size is 0 */
counter = 0; /* Update twiddle every 16MB */
@@ -184,13 +185,16 @@
va = 0;
pgs = mdp->md_size / PAGE_SIZE;
pa = mdp->md_start;
+ maxdumppgs = di->maxiosize / PAGE_SIZE;
+ if (maxdumppgs == 0) /* seatbelt */
+ maxdumppgs = 1;
printf(" chunk %d: %ldMB (%ld pages)", seqnr, PG2MB(pgs), pgs);
while (pgs) {
chunk = pgs;
- if (chunk > MAXDUMPPGS)
- chunk = MAXDUMPPGS;
+ if (chunk > maxdumppgs)
+ chunk = maxdumppgs;
sz = chunk << PAGE_SHIFT;
counter += sz;
if (counter >> 24) {
==== //depot/projects/e500/sys/amd64/amd64/minidump_machdep.c#3 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,11 @@
{
size_t len;
int error, i, c;
+ u_int maxdumpsz;
+ maxdumpsz = di->maxiosize;
+ if (maxdumpsz == 0) /* seatbelt */
+ maxdumpsz = PAGE_SIZE;
error = 0;
if ((sz % PAGE_SIZE) != 0) {
printf("size not page aligned\n");
@@ -143,7 +147,7 @@
return (error);
}
while (sz) {
- len = (MAXDUMPPGS * PAGE_SIZE) - fragsz;
+ len = maxdumpsz - fragsz;
if (len > sz)
len = sz;
counter += len;
@@ -165,7 +169,7 @@
fragsz += len;
pa += len;
sz -= len;
- if (fragsz == (MAXDUMPPGS * PAGE_SIZE)) {
+ if (fragsz == maxdumpsz) {
error = blk_flush(di);
if (error)
return (error);
==== //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#6 (text+ko) ====
==== //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/powerpc/uboot/help.uboot#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/powerpc/uboot/ldscript.powerpc#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/powerpc/uboot/start.S#4 (text+ko) ====
==== //depot/projects/e500/sys/boot/powerpc/uboot/version#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/Makefile#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/common/Makefile.inc#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/common/main.c#4 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/Makefile#7 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/api_public.h#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/console.c#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/copy.c#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/devicename.c#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/disk.c#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/elf_freebsd.c#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/glue.c#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/module.c#2 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/net.c#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/reboot.c#3 (text+ko) ====
==== //depot/projects/e500/sys/boot/uboot/lib/time.c#3 (text+ko) ====
==== //depot/projects/e500/sys/dev/acpica/acpi_cpu.c#6 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.69 2008/02/12 15:26:59 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.70 2008/02/16 02:00:25 rpaulo Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -590,7 +590,7 @@
return;
/* Validate and allocate resources for C3 (P_LVL3). */
- if (AcpiGbl_FADT.C3Latency <= 1000) {
+ if (AcpiGbl_FADT.C3Latency <= 1000 && !(cpu_quirks & CPU_QUIRK_NO_C3)) {
gas.Address = sc->cpu_p_blk + 5;
acpi_bus_alloc_gas(sc->cpu_dev, &cx_ptr->res_type, &sc->cpu_rid, &gas,
&cx_ptr->p_lvlx, RF_SHAREABLE);
==== //depot/projects/e500/sys/dev/acpica/acpi_thermal.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.67 2007/12/31 15:56:03 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.69 2008/02/16 07:15:34 ume Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -173,6 +173,8 @@
static struct proc *acpi_tz_proc;
ACPI_LOCK_DECL(thermal, "ACPI thermal zone");
+static int acpi_tz_cooling_unit = -1;
+
static int
acpi_tz_probe(device_t dev)
{
@@ -206,17 +208,7 @@
sc->tz_cooling_proc_running = FALSE;
sc->tz_cooling_active = FALSE;
sc->tz_cooling_updated = FALSE;
-
- /*
- * Always attempt to enable passive cooling for tz0. Users can enable
- * it for other zones manually for now.
- *
- * XXX We need to test if multiple zones conflict with each other
- * since cpufreq currently sets all CPUs to the given frequency whereas
- * it's possible for different thermal zones to specify independent
- * settings for multiple CPUs.
- */
- sc->tz_cooling_enabled = (device_get_unit(dev) == 0);
+ sc->tz_cooling_enabled = FALSE;
/*
* Parse the current state of the thermal zone and build control
@@ -325,16 +317,25 @@
}
}
- /* Create a thread to handle passive cooling for each zone if enabled. */
+ /*
+ * Create a thread to handle passive cooling for 1st zone which
+ * has _PSV, _TSP, _TC1 and _TC2. Users can enable it for other
+ * zones manually for now.
+ *
+ * XXX We enable only one zone to avoid multiple zones conflict
+ * with each other since cpufreq currently sets all CPUs to the
+ * given frequency whereas it's possible for different thermal
+ * zones to specify independent settings for multiple CPUs.
+ */
+ if (acpi_tz_cooling_unit < 0 && acpi_tz_cooling_is_available(sc))
+ sc->tz_cooling_enabled = TRUE;
if (sc->tz_cooling_enabled) {
- if (acpi_tz_cooling_is_available(sc)) {
- error = acpi_tz_cooling_thread_start(sc);
- if (error != 0) {
- sc->tz_cooling_enabled = FALSE;
- goto out;
- }
- } else
+ error = acpi_tz_cooling_thread_start(sc);
+ if (error != 0) {
sc->tz_cooling_enabled = FALSE;
+ goto out;
+ }
+ acpi_tz_cooling_unit = device_get_unit(dev);
}
/*
@@ -528,7 +529,8 @@
}
/* Handle user override of active mode */
- if (sc->tz_requested != TZ_ACTIVE_NONE && sc->tz_requested < newactive)
+ if (sc->tz_requested != TZ_ACTIVE_NONE && (newactive == TZ_ACTIVE_NONE
+ || sc->tz_requested < newactive))
newactive = sc->tz_requested;
/* update temperature-related flags */
==== //depot/projects/e500/sys/dev/coretemp/coretemp.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $
+ * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.6 2008/02/14 14:14:59 rpaulo Exp $
*
*/
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.5 2008/01/10 16:09:22 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.6 2008/02/14 14:14:59 rpaulo Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -143,6 +143,15 @@
cpu_model += ((cpu_id >> 16) & 0xf) << 4;
cpu_mask = cpu_id & 15;
+ /*
+ * Some CPUs, namely the PIII, don't have thermal sensors, but
+ * report them when the CPUID check is performed in
+ * coretemp_identify(). This leads to a later GPF when the sensor
+ * is queried via a MSR, so we stop here.
+ */
+ if (cpu_model < 0xe)
+ return (ENXIO);
+
#if 0 /*
* XXXrpaulo: I have this CPU model and when it returns from C3
* coretemp continues to function properly.
==== //depot/projects/e500/sys/dev/mxge/if_mxge.c#9 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.46 2008/02/14 00:09:59 gallatin Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.47 2008/02/14 16:24:14 gallatin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2685,7 +2685,7 @@
}
valid = stats->valid;
- if (!sc->msi_enabled) {
+ if (sc->legacy_irq) {
/* lower legacy IRQ */
*sc->irq_deassert = 0;
if (!mxge_deassert_wait)
@@ -2705,6 +2705,8 @@
mxge_clean_rx_done(ss);
send_done_count = be32toh(stats->send_done_count);
}
+ if (sc->legacy_irq && mxge_deassert_wait)
+ mb();
} while (*((volatile uint8_t *) &stats->valid));
if (__predict_false(stats->stats_updated)) {
@@ -4035,9 +4037,9 @@
count = pci_msi_count(sc->dev);
if (count == 1 && pci_alloc_msi(sc->dev, &count) == 0) {
rid = 1;
- sc->msi_enabled = 1;
} else {
rid = 0;
+ sc->legacy_irq = 1;
}
sc->irq_res = bus_alloc_resource(sc->dev, SYS_RES_IRQ, &rid, 0, ~0,
1, RF_SHAREABLE | RF_ACTIVE);
@@ -4047,7 +4049,7 @@
}
if (mxge_verbose)
device_printf(sc->dev, "using %s irq %ld\n",
- sc->msi_enabled ? "MSI" : "INTx",
+ sc->legacy_irq ? "INTx" : "MSI",
rman_get_start(sc->irq_res));
err = bus_setup_intr(sc->dev, sc->irq_res,
INTR_TYPE_NET | INTR_MPSAFE,
@@ -4057,8 +4059,8 @@
mxge_intr, &sc->ss[0], &sc->ih);
if (err != 0) {
bus_release_resource(sc->dev, SYS_RES_IRQ,
- sc->msi_enabled ? 1 : 0, sc->irq_res);
- if (sc->msi_enabled)
+ sc->legacy_irq ? 0 : 1, sc->irq_res);
+ if (!sc->legacy_irq)
pci_release_msi(sc->dev);
}
return err;
@@ -4099,8 +4101,8 @@
{
bus_teardown_intr(sc->dev, sc->irq_res, sc->ih);
bus_release_resource(sc->dev, SYS_RES_IRQ,
- sc->msi_enabled ? 1 : 0, sc->irq_res);
- if (sc->msi_enabled)
+ sc->legacy_irq ? 0 : 1, sc->irq_res);
+ if (!sc->legacy_irq)
pci_release_msi(sc->dev);
}
==== //depot/projects/e500/sys/dev/mxge/if_mxge_var.h#7 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list