CVS commit: [rmind-uvmplock] src/sys/arch/sparc/include
Module Name:src Committed By: mrg Date: Wed Mar 24 06:02:48 UTC 2010 Modified Files: src/sys/arch/sparc/include [rmind-uvmplock]: types.h Log Message: only define __HAVE_MM_MD_READWRITE for !SUN4U builds. To generate a diff of this commit: cvs rdiff -u -r1.52.4.1 -r1.52.4.2 src/sys/arch/sparc/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/include/types.h diff -u src/sys/arch/sparc/include/types.h:1.52.4.1 src/sys/arch/sparc/include/types.h:1.52.4.2 --- src/sys/arch/sparc/include/types.h:1.52.4.1 Thu Mar 18 04:36:52 2010 +++ src/sys/arch/sparc/include/types.h Wed Mar 24 06:02:48 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.52.4.1 2010/03/18 04:36:52 rmind Exp $ */ +/* $NetBSD: types.h,v 1.52.4.2 2010/03/24 06:02:48 mrg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -116,15 +116,16 @@ #define __HAVE_DEVICE_REGISTER #define __HAVE_SYSCALL_INTERN #define __GENERIC_SOFT_INTERRUPTS_ALL_LEVELS -#define __HAVE_MM_MD_READWRITE #ifdef SUN4U -#define __HAVE_DEVICE_REGISTER_POSTCONFIG +#define __HAVE_DEVICE_REGISTER_POSTCONFIG #define __HAVE_ATOMIC64_OPS -#define __HAVE_CPU_COUNTER /* sparc v9 CPUs have %tick */ +#define __HAVE_CPU_COUNTER /* sparc v9 CPUs have %tick */ #if defined(_KERNEL) -#define __HAVE_RAS +#define __HAVE_RAS #endif +#else +#define __HAVE_MM_MD_READWRITE #endif
CVS commit: src/lib/libpthread
Module Name:src Committed By: explorer Date: Wed Mar 24 07:27:22 UTC 2010 Modified Files: src/lib/libpthread: pthread.c Log Message: Correctly set pt_lid in the child, after a fork To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/lib/libpthread/pthread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpthread/pthread.c diff -u src/lib/libpthread/pthread.c:1.113 src/lib/libpthread/pthread.c:1.114 --- src/lib/libpthread/pthread.c:1.113 Sat Oct 3 23:49:50 2009 +++ src/lib/libpthread/pthread.c Wed Mar 24 07:27:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread.c,v 1.113 2009/10/03 23:49:50 christos Exp $ */ +/* $NetBSD: pthread.c,v 1.114 2010/03/24 07:27:22 explorer Exp $ */ /*- * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: pthread.c,v 1.113 2009/10/03 23:49:50 christos Exp $); +__RCSID($NetBSD: pthread.c,v 1.114 2010/03/24 07:27:22 explorer Exp $); #define __EXPOSE_STACK 1 @@ -256,6 +256,8 @@ * much. Anything that permits some pthread_* calls to work is * merely being polite. */ + struct __pthread_st *self = pthread_self(); + self-pt_lid = _lwp_self(); pthread__started = 0; }
CVS commit: othersrc/libexec/tnftpd/src
Module Name:othersrc Committed By: lukem Date: Wed Mar 24 12:11:21 UTC 2010 Modified Files: othersrc/libexec/tnftpd/src: version.h Log Message: apply rev 1.74 from NetBSD: Identify as NetBSD-ftpd 20100320 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 othersrc/libexec/tnftpd/src/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/libexec/tnftpd/src/version.h diff -u othersrc/libexec/tnftpd/src/version.h:1.6 othersrc/libexec/tnftpd/src/version.h:1.7 --- othersrc/libexec/tnftpd/src/version.h:1.6 Sat Nov 7 03:26:21 2009 +++ othersrc/libexec/tnftpd/src/version.h Wed Mar 24 12:11:20 2010 @@ -1,5 +1,5 @@ -/* $NetBSD: version.h,v 1.6 2009/11/07 03:26:21 lukem Exp $ */ -/* from NetBSD: version.h,v 1.73 2009/11/07 03:10:05 lukem Exp */ +/* $NetBSD: version.h,v 1.7 2010/03/24 12:11:20 lukem Exp $ */ +/* from NetBSD: version.h,v 1.74 2010/03/21 20:27:26 lukem Exp */ /*- * Copyright (c) 1999-2009 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,5 +30,5 @@ */ #ifndef FTPD_VERSION -#define FTPD_VERSION NetBSD-ftpd 20091107 +#define FTPD_VERSION NetBSD-ftpd 20100320 #endif
CVS commit: othersrc/libexec/tnftpd
Module Name:othersrc Committed By: lukem Date: Wed Mar 24 12:13:06 UTC 2010 Modified Files: othersrc/libexec/tnftpd: ChangeLog Log Message: Improve entry for the manual merge of NetBSD-ftpd 20100320. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 othersrc/libexec/tnftpd/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/libexec/tnftpd/ChangeLog diff -u othersrc/libexec/tnftpd/ChangeLog:1.52 othersrc/libexec/tnftpd/ChangeLog:1.53 --- othersrc/libexec/tnftpd/ChangeLog:1.52 Sun Mar 21 11:10:25 2010 +++ othersrc/libexec/tnftpd/ChangeLog Wed Mar 24 12:13:06 2010 @@ -1,9 +1,10 @@ -$NetBSD: ChangeLog,v 1.52 2010/03/21 11:10:25 lukem Exp $ +$NetBSD: ChangeLog,v 1.53 2010/03/24 12:13:06 lukem Exp $ -Sun Mar 21 11:07:56 UTC 2010 lukem +Wed Mar 24 12:11:26 UTC 2010 lukem - * Security fix; apply NetBSD popen.c 1.37: - PR/43023: Bruce Cran: FTPD bug remote crash + * Update to NetBSD-ftpd 20100320 (manually merging patches): + * Security fix; apply NetBSD popen.c 1.37: + PR/43023: Bruce Cran: FTPD bug remote crash Mon Jan 4 05:51:15 UTC 2010 lukem
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Wed Mar 24 12:15:54 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c
Log Message:
Do the initial refresh before creating the event monitors, in case the
event monitors require some of the data loaded by the refresh. For
example, the initial refresh might load sensor limits and max_value in
addition to the cur_value.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/sysmon/sysmon_envsys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.97 src/sys/dev/sysmon/sysmon_envsys.c:1.98
--- src/sys/dev/sysmon/sysmon_envsys.c:1.97 Sun Mar 14 18:03:15 2010
+++ src/sys/dev/sysmon/sysmon_envsys.c Wed Mar 24 12:15:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.97 2010/03/14 18:03:15 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.98 2010/03/24 12:15:54 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.97 2010/03/14 18:03:15 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.98 2010/03/24 12:15:54 pgoyette Exp $);
#include sys/param.h
#include sys/types.h
@@ -755,12 +755,20 @@
out:
/*
- * No errors? register the events that were set in the driver
- * and make an initial data refresh if was requested.
+ * No errors? Make an initial data refresh if was requested,
+ * then register the events that were set in the driver. Do
+ * the refresh first in case it is needed to establish the
+ * limits or max_value needed by some events.
*/
if (error == 0) {
nevent = 0;
sysmon_task_queue_init();
+
+ if (sme-sme_flags SME_INIT_REFRESH) {
+ sysmon_task_queue_sched(0, sme_initial_refresh, sme);
+ DPRINTF((%s: scheduled initial refresh for '%s'\n,
+__func__, sme-sme_name));
+ }
SLIST_FOREACH(evdv, sme_evdrv_list, evdrv_head) {
sysmon_task_queue_sched(0,
sme_event_drvadd, evdv-evdrv);
@@ -768,9 +776,6 @@
}
DPRINTF((%s: driver '%s' registered (nsens=%d nevent=%d)\n,
__func__, sme-sme_name, sme-sme_nsensors, nevent));
-
- if (sme-sme_flags SME_INIT_REFRESH)
- sysmon_task_queue_sched(0, sme_initial_refresh, sme);
}
out2:
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: pgoyette Date: Wed Mar 24 12:18:54 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: Set the SME_INIT_REFRESH flag so that the sensors' values (including charge's max_value) are available when the event monitors are created. To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/acpi_bat.c diff -u src/sys/dev/acpi/acpi_bat.c:1.94 src/sys/dev/acpi/acpi_bat.c:1.95 --- src/sys/dev/acpi/acpi_bat.c:1.94 Mon Mar 22 15:08:35 2010 +++ src/sys/dev/acpi/acpi_bat.c Wed Mar 24 12:18:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_bat.c,v 1.94 2010/03/22 15:08:35 jruoho Exp $ */ +/* $NetBSD: acpi_bat.c,v 1.95 2010/03/24 12:18:54 pgoyette Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.94 2010/03/22 15:08:35 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.95 2010/03/24 12:18:54 pgoyette Exp $); #include sys/param.h #include sys/condvar.h @@ -721,7 +721,7 @@ sc-sc_sme-sme_cookie = dv; sc-sc_sme-sme_refresh = acpibat_refresh; sc-sc_sme-sme_class = SME_CLASS_BATTERY; - sc-sc_sme-sme_flags = SME_POLL_ONLY; + sc-sc_sme-sme_flags = SME_POLL_ONLY | SME_INIT_REFRESH; sc-sc_sme-sme_get_limits = acpibat_get_limits; acpibat_update_info(dv);
CVS commit: othersrc/libexec/tnftpd
Module Name:othersrc Committed By: lukem Date: Wed Mar 24 12:31:39 UTC 2010 Modified Files: othersrc/libexec/tnftpd: configure.ac Log Message: tnftpd 20100324: * Security fix when globbing paths. NetBSD PR/43023. * Install example configuration files. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 othersrc/libexec/tnftpd/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/libexec/tnftpd/configure.ac diff -u othersrc/libexec/tnftpd/configure.ac:1.28 othersrc/libexec/tnftpd/configure.ac:1.29 --- othersrc/libexec/tnftpd/configure.ac:1.28 Mon Jan 4 05:44:10 2010 +++ othersrc/libexec/tnftpd/configure.ac Wed Mar 24 12:31:39 2010 @@ -1,15 +1,15 @@ -# $NetBSD: configure.ac,v 1.28 2010/01/04 05:44:10 lukem Exp $ +# $NetBSD: configure.ac,v 1.29 2010/03/24 12:31:39 lukem Exp $ # # Process this file with autoconf to produce a configure script. -AC_INIT([tnftpd], [20091122], [lu...@netbsd.org]) +AC_INIT([tnftpd], [20100324], [lu...@netbsd.org]) AC_PREREQ([2.61]) AC_COPYRIGHT([ Copyright (c) 2001-2009 The NetBSD Foundation, Inc. All rights reserved. ]) -AC_REVISION([$Revision: 1.28 $]) +AC_REVISION([$Revision: 1.29 $]) AS_SHELL_SANITIZE
CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Wed Mar 24 12:38:55 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: intr.c Log Message: Improve panic message. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hp700/hp700/intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/hp700/intr.c diff -u src/sys/arch/hp700/hp700/intr.c:1.22 src/sys/arch/hp700/hp700/intr.c:1.23 --- src/sys/arch/hp700/hp700/intr.c:1.22 Thu Mar 11 07:21:24 2010 +++ src/sys/arch/hp700/hp700/intr.c Wed Mar 24 12:38:55 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.22 2010/03/11 07:21:24 skrll Exp $ */ +/* $NetBSD: intr.c,v 1.23 2010/03/24 12:38:55 skrll Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.22 2010/03/11 07:21:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.23 2010/03/24 12:38:55 skrll Exp $); #define __MUTEX_PRIVATE @@ -175,7 +175,7 @@ /* Panic on a bad interrupt bit. */ if (bit_pos 0 || bit_pos = HP700_INT_BITS) - panic(hp700_intr_establish: bad interrupt bit); + panic(%s: bad interrupt bit %d, __func__, bit_pos); /* * Panic if this int bit is already handled,
CVS commit: othersrc/libexec/tnftpd
Module Name:othersrc Committed By: lukem Date: Wed Mar 24 12:39:15 UTC 2010 Modified Files: othersrc/libexec/tnftpd: ChangeLog Log Message: tnftpd 20100324 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 othersrc/libexec/tnftpd/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/libexec/tnftpd/ChangeLog diff -u othersrc/libexec/tnftpd/ChangeLog:1.53 othersrc/libexec/tnftpd/ChangeLog:1.54 --- othersrc/libexec/tnftpd/ChangeLog:1.53 Wed Mar 24 12:13:06 2010 +++ othersrc/libexec/tnftpd/ChangeLog Wed Mar 24 12:39:15 2010 @@ -1,6 +1,8 @@ -$NetBSD: ChangeLog,v 1.53 2010/03/24 12:13:06 lukem Exp $ +$NetBSD: ChangeLog,v 1.54 2010/03/24 12:39:15 lukem Exp $ -Wed Mar 24 12:11:26 UTC 2010 lukem +Wed Mar 24 12:34:09 UTC 2010 lukem + + * Release as tnftpd 20100324 * Update to NetBSD-ftpd 20100320 (manually merging patches): * Security fix; apply NetBSD popen.c 1.37:
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: skrll
Date: Wed Mar 24 12:56:30 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa: trap.c
Log Message:
Correct the list of traps that we need to get the va and space from
ii[os]q.
From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/hppa/hppa/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.83 src/sys/arch/hppa/hppa/trap.c:1.84
--- src/sys/arch/hppa/hppa/trap.c:1.83 Mon Mar 22 23:29:11 2010
+++ src/sys/arch/hppa/hppa/trap.c Wed Mar 24 12:56:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.83 2010/03/22 23:29:11 skrll Exp $ */
+/* $NetBSD: trap.c,v 1.84 2010/03/24 12:56:30 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.83 2010/03/22 23:29:11 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.84 2010/03/24 12:56:30 skrll Exp $);
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@@ -498,8 +498,10 @@
trapnum = type ~T_USER;
opcode = frame-tf_iir;
- if (trapnum == T_ITLBMISS || trapnum == T_ITLBMISSNA ||
- trapnum == T_IBREAK || trapnum == T_TAKENBR) {
+
+ if (trapnum = T_EXCEPTION || trapnum == T_HIGHERPL ||
+ trapnum == T_LOWERPL || trapnum == T_TAKENBR ||
+ trapnum == T_IDEBUG || trapnum == T_PERFMON) {
va = frame-tf_iioq_head;
space = frame-tf_iisq_head;
vftype = VM_PROT_EXECUTE;
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Wed Mar 24 13:11:41 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys_events.c
Log Message:
In sysmon_envsys_sensor_event(), permit delivery of all events for the
sensor if no event type is specified.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/sysmon/sysmon_envsys_events.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.88 src/sys/dev/sysmon/sysmon_envsys_events.c:1.89
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.88 Tue Mar 23 16:52:02 2010
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Wed Mar 24 13:11:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.88 2010/03/23 16:52:02 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.89 2010/03/24 13:11:41 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.88 2010/03/23 16:52:02 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.89 2010/03/24 13:11:41 pgoyette Exp $);
#include sys/param.h
#include sys/types.h
@@ -646,7 +646,8 @@
* sysmon_envsys_sensor_event
*
* + Find the monitor event of a particular type for a given sensor
- * on a device and deliver the event if one is required.
+ * on a device and deliver the event if one is required. If
+ * no event type is specified, deliver all events for the sensor.
*/
void
sysmon_envsys_sensor_event(struct sysmon_envsys *sme, envsys_data_t *edata,
@@ -656,11 +657,14 @@
mutex_enter(sme-sme_mtx);
LIST_FOREACH(see, sme-sme_events_list, see_list) {
- if (edata != see-see_edata ||
- see-see_type != ev_type)
- continue;
- sme_deliver_event(see);
- break;
+ if (edata != see-see_edata)
+ continue;
+ if (ev_type == 0 ||
+ ev_type == see-see_type) {
+ sme_deliver_event(see);
+ if (ev_type != 0)
+break;
+ }
}
mutex_exit(sme-sme_mtx);
}
CVS commit: src/sys/arch/arm/xscale
Module Name:src Committed By: scw Date: Wed Mar 24 13:55:04 UTC 2010 Modified Files: src/sys/arch/arm/xscale: ixp425-fw.README Log Message: Update with new download link provided by Marcin M. Jessa in http://mail-index.netbsd.org/port-arm/2010/03/24/msg000912.html. Add a note about version 3.0 microcode. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/xscale/ixp425-fw.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/xscale/ixp425-fw.README diff -u src/sys/arch/arm/xscale/ixp425-fw.README:1.1 src/sys/arch/arm/xscale/ixp425-fw.README:1.2 --- src/sys/arch/arm/xscale/ixp425-fw.README:1.1 Sun Dec 10 10:01:49 2006 +++ src/sys/arch/arm/xscale/ixp425-fw.README Wed Mar 24 13:55:04 2010 @@ -1,4 +1,4 @@ -$NetBSD: ixp425-fw.README,v 1.1 2006/12/10 10:01:49 scw Exp $ +$NetBSD: ixp425-fw.README,v 1.2 2010/03/24 13:55:04 scw Exp $ IXP425 NPE Microcode @@ -19,7 +19,7 @@ You must grab the NPE microcode from here: - http://www.intel.com/design/network/products/npfamily/ixp400_current.htm + http://www.intel.com/design/network/products/npfamily/download_ixp400.htm Select the Download (without Crypto) link in the NPE Microcode section. Note that there is no benefit in selecting the with Cypto @@ -29,6 +29,10 @@ version 2.3. Newer versions may not work with NetBSD's native Ethernet driver. If this is the case, let us know via send-pr(1). +Update: As of March 2010, NPE Microcode is at version 3.0 and has been +confirmed to work. See: + http://mail-index.netbsd.org/port-arm/2010/03/24/msg000912.html + After clicking the link, you will be directed to a click-through license page. Assuming you agree to the terms of the license (and you are *strongly* advised to print it out and read it carefully) you will then
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: cliff Date: Wed Mar 24 19:14:09 UTC 2010 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixlreg.h Log Message: shift enable bits into correct field in RMIXL_PIC_CONTROL_TIMER_ENBn() macro To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/arch/mips/rmi/rmixlreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/rmi/rmixlreg.h diff -u src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.9 src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.10 --- src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.9 Sun Mar 21 21:30:35 2010 +++ src/sys/arch/mips/rmi/rmixlreg.h Wed Mar 24 19:14:09 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixlreg.h,v 1.1.2.9 2010/03/21 21:30:35 cliff Exp $ */ +/* $NetBSD: rmixlreg.h,v 1.1.2.10 2010/03/24 19:14:09 cliff Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -453,7 +453,7 @@ #define RMIXL_PIC_CONTROL_GEN_NMIn(n) (((n) 1) RMIXL_PIC_CONTROL_GEN_NMI) #define RMIXL_PIC_CONTROL_RESa __BITS(7,3) #define RMIXL_PIC_CONTROL_TIMER_ENB __BITS(15,8) /* per-Timer enable bits */ -#define RMIXL_PIC_CONTROL_TIMER_ENBn(n) ((1 (n)) RMIXL_PIC_CONTROL_TIMER_ENB) +#define RMIXL_PIC_CONTROL_TIMER_ENBn(n) ((1 (8 + (n))) RMIXL_PIC_CONTROL_TIMER_ENB) #define RMIXL_PIC_CONTROL_RESb __BITS(31,16) #define RMIXL_PIC_CONTROL_RESV \ (RMIXL_PIC_CONTROL_RESa|RMIXL_PIC_CONTROL_RESb)
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: njoly Date: Wed Mar 24 19:15:00 UTC 2010 Modified Files: src/sys/dev/sysmon: sysmon_envsys_events.c Log Message: Fix ENVSYS_DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/dev/sysmon/sysmon_envsys_events.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/sysmon/sysmon_envsys_events.c diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.89 src/sys/dev/sysmon/sysmon_envsys_events.c:1.90 --- src/sys/dev/sysmon/sysmon_envsys_events.c:1.89 Wed Mar 24 13:11:41 2010 +++ src/sys/dev/sysmon/sysmon_envsys_events.c Wed Mar 24 19:15:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_envsys_events.c,v 1.89 2010/03/24 13:11:41 pgoyette Exp $ */ +/* $NetBSD: sysmon_envsys_events.c,v 1.90 2010/03/24 19:15:00 njoly Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.89 2010/03/24 13:11:41 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.90 2010/03/24 19:15:00 njoly Exp $); #include sys/param.h #include sys/types.h @@ -113,7 +113,7 @@ * even if its ENVSYS_FPERCENT flag and value_max are set. */ - DPRINTF((%s: units %d props 0x%04x upropset 0x%04x max_val %PRId64 + DPRINTF((%s: units %d props 0x%04x upropset 0x%04x max_val %d edata-flags 0x%04x\n, __func__, edata-units, props, edata-upropset, edata-value_max, edata-flags));
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src
Committed By: cliff
Date: Wed Mar 24 19:23:03 UTC 2010
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: intr.h
Log Message:
- add IPI_AST variant of IPI_NOP to allow seperate event counting
To generate a diff of this commit:
cvs rdiff -u -r1.3.96.9 -r1.3.96.10 src/sys/arch/mips/include/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/intr.h
diff -u src/sys/arch/mips/include/intr.h:1.3.96.9 src/sys/arch/mips/include/intr.h:1.3.96.10
--- src/sys/arch/mips/include/intr.h:1.3.96.9 Sun Mar 21 18:21:15 2010
+++ src/sys/arch/mips/include/intr.h Wed Mar 24 19:23:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3.96.9 2010/03/21 18:21:15 cliff Exp $ */
+/* $NetBSD: intr.h,v 1.3.96.10 2010/03/24 19:23:02 cliff Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -55,11 +55,12 @@
#define IST_LEVEL_LOW 5 /* level triggered, active low */
#define IPI_NOP 0 /* do nothing, interrupt only */
-#define IPI_SHOOTDOWN 1 /* do a tlb shootdown */
-#define IPI_FPSAVE 2 /* save current fp registers */
-#define IPI_SYNCICACHE 3 /* sync icache for pages */
-#define IPI_KPREEMPT 4 /* schedule a kernel preemption */
-#define NIPIS 5
+#define IPI_AST 1 /* force ast */
+#define IPI_SHOOTDOWN 2 /* do a tlb shootdown */
+#define IPI_FPSAVE 3 /* save current fp registers */
+#define IPI_SYNCICACHE 4 /* sync icache for pages */
+#define IPI_KPREEMPT 5 /* schedule a kernel preemption */
+#define NIPIS 6
#ifdef __INTR_PRIVATE
struct splsw {
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: cliff
Date: Wed Mar 24 19:23:24 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_subr.c
Log Message:
- use IPI_AST instead of IPI_NOP when forcing ast
- remove residual debug ipi from cpu_boot_secondary_processors()
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/mips/mips/cpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.1.2.6 src/sys/arch/mips/mips/cpu_subr.c:1.1.2.7
--- src/sys/arch/mips/mips/cpu_subr.c:1.1.2.6 Sun Mar 21 18:43:28 2010
+++ src/sys/arch/mips/mips/cpu_subr.c Wed Mar 24 19:23:24 2010
@@ -32,7 +32,7 @@
#include opt_multiprocessor.h
#include opt_sa.h
-__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.1.2.6 2010/03/21 18:43:28 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.1.2.7 2010/03/24 19:23:24 cliff Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -481,7 +481,7 @@
l-l_md.md_astpending = 1; /* force call to ast() */
#ifdef MULTIPROCESSOR
if (ci != cur_ci (flags RESCHED_IMMED)) {
- cpu_send_ipi(ci, IPI_NOP);
+ cpu_send_ipi(ci, IPI_AST);
}
#endif
}
@@ -677,9 +677,6 @@
ci-ci_data.cpu_cc_skew = mips3_cp0_count_read();
atomic_or_ulong(ci-ci_flags, CPUF_RUNNING);
atomic_or_ulong(cpus_running, cpu_mask);
-#if 1 /* XXX TMP */
- cpu_send_ipi(ci, IPI_NOP);
-#endif
}
}
#endif /* MULTIPROCESSOR */
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: cliff
Date: Wed Mar 24 19:23:46 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: ipifuncs.c
Log Message:
- add ipi name for IPI_AST
- in ipi_process(), add event counting, and process IPI_AST
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/mips/ipifuncs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/ipifuncs.c
diff -u src/sys/arch/mips/mips/ipifuncs.c:1.1.2.2 src/sys/arch/mips/mips/ipifuncs.c:1.1.2.3
--- src/sys/arch/mips/mips/ipifuncs.c:1.1.2.2 Thu Mar 11 08:09:15 2010
+++ src/sys/arch/mips/mips/ipifuncs.c Wed Mar 24 19:23:46 2010
@@ -29,7 +29,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.1.2.2 2010/03/11 08:09:15 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.1.2.3 2010/03/24 19:23:46 cliff Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -41,6 +41,7 @@
static const char * const ipi_names[] = {
[IPI_NOP] = ipi nop,
+ [IPI_AST] = ipi ast,
[IPI_SHOOTDOWN] = ipi shootdown,
[IPI_FPSAVE] = ipi fpsave,
[IPI_SYNCICACHE] = ipi isync,
@@ -91,17 +92,31 @@
{
KASSERT(cpu_intr_p());
- if (ipi_mask __BIT(IPI_NOP))
+ if (ipi_mask __BIT(IPI_NOP)) {
+ ci-ci_evcnt_per_ipi[IPI_NOP].ev_count++;
ipi_nop(ci);
- if (ipi_mask __BIT(IPI_SHOOTDOWN))
+ }
+ if (ipi_mask __BIT(IPI_AST)) {
+ ci-ci_evcnt_per_ipi[IPI_AST].ev_count++;
+ ipi_nop(ci);
+ }
+ if (ipi_mask __BIT(IPI_SHOOTDOWN)) {
+ ci-ci_evcnt_per_ipi[IPI_NOP].ev_count++;
ipi_shootdown(ci);
- if (ipi_mask __BIT(IPI_FPSAVE))
+ }
+ if (ipi_mask __BIT(IPI_FPSAVE)) {
+ ci-ci_evcnt_per_ipi[IPI_NOP].ev_count++;
ipi_fpsave(ci);
- if (ipi_mask __BIT(IPI_SYNCICACHE))
+ }
+ if (ipi_mask __BIT(IPI_SYNCICACHE)) {
+ ci-ci_evcnt_per_ipi[IPI_NOP].ev_count++;
ipi_syncicache(ci);
+ }
#ifdef IPI_HALT
- if (ipi_mask __BIT(IPI_HALT))
+ if (ipi_mask __BIT(IPI_HALT)) {
+ ci-ci_evcnt_per_ipi[IPI_NOP].ev_count++;
ipi_halt();
+ }
#endif
}
@@ -115,6 +130,7 @@
NULL, device_xname(ci-ci_dev), ipi);
for (size_t i = 0; i NIPIS; i++) {
+ KASSERT(ipi_names[i] != NULL);
evcnt_attach_dynamic(ci-ci_evcnt_per_ipi[i], EVCNT_TYPE_INTR,
NULL, device_xname(ci-ci_dev), ipi_names[i]);
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tnn Date: Wed Mar 24 19:33:51 UTC 2010 Modified Files: src/sys/dev/ic: vga_raster.c Removed Files: src/sys/dev/ic: videomode.h Log Message: sys/dev/ic/videomode.h is almost identical to sys/dev/videomode/videomode.h Remove the former. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/vga_raster.c cvs rdiff -u -r1.4 -r0 src/sys/dev/ic/videomode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/vga_raster.c diff -u src/sys/dev/ic/vga_raster.c:1.33 src/sys/dev/ic/vga_raster.c:1.34 --- src/sys/dev/ic/vga_raster.c:1.33 Sun Oct 19 17:47:38 2008 +++ src/sys/dev/ic/vga_raster.c Wed Mar 24 19:33:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vga_raster.c,v 1.33 2008/10/19 17:47:38 jmcneill Exp $ */ +/* $NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $ */ /* * Copyright (c) 2001, 2002 Bang Jun-Young @@ -56,7 +56,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.33 2008/10/19 17:47:38 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $); #include opt_wsmsgattrs.h /* for WSDISPLAY_CUSTOM_OUTPUT */ @@ -73,7 +73,7 @@ #include dev/ic/pcdisplayvar.h #include dev/ic/vgareg.h #include dev/ic/vgavar.h -#include dev/ic/videomode.h +#include dev/videomode/videomode.h #include dev/wscons/wsdisplayvar.h #include dev/wscons/wsconsio.h
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: joerg Date: Wed Mar 24 20:52:39 UTC 2010 Removed Files: src/external/bsd/fetch/dist/libfetch: fetch.cat3 Log Message: Merge To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/fetch/dist/libfetch/fetch.cat3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpthread
Module Name:src
Committed By: explorer
Date: Thu Mar 25 01:15:00 UTC 2010
Modified Files:
src/lib/libpthread: pthread.c
Log Message:
fix the pthread pt_lid in the fork callback function that runs in the child
instead of a function that may be going away. KNFify
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/lib/libpthread/pthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.114 src/lib/libpthread/pthread.c:1.115
--- src/lib/libpthread/pthread.c:1.114 Wed Mar 24 07:27:22 2010
+++ src/lib/libpthread/pthread.c Thu Mar 25 01:15:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.114 2010/03/24 07:27:22 explorer Exp $ */
+/* $NetBSD: pthread.c,v 1.115 2010/03/25 01:15:00 explorer Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread.c,v 1.114 2010/03/24 07:27:22 explorer Exp $);
+__RCSID($NetBSD: pthread.c,v 1.115 2010/03/25 01:15:00 explorer Exp $);
#define __EXPOSE_STACK 1
@@ -235,11 +235,14 @@
static void
pthread__fork_callback(void)
{
+ struct __pthread_st *self;
/* lwpctl state is not copied across fork. */
if (_lwp_ctl(LWPCTL_FEATURE_CURCPU, pthread__first-pt_lwpctl)) {
err(1, _lwp_ctl);
}
+ self = pthread__self();
+ self-pt_lid = _lwp_self();
}
static void
@@ -256,8 +259,6 @@
* much. Anything that permits some pthread_* calls to work is
* merely being polite.
*/
- struct __pthread_st *self = pthread_self();
- self-pt_lid = _lwp_self();
pthread__started = 0;
}
