CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jruoho Date: Wed Mar 3 06:57:54 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Remove ACPI_EXTRA_DEBUG. To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/sys/arch/i386/conf/ALL 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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.244 src/sys/arch/i386/conf/ALL:1.245 --- src/sys/arch/i386/conf/ALL:1.244 Sun Feb 28 13:10:43 2010 +++ src/sys/arch/i386/conf/ALL Wed Mar 3 06:57:53 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.244 2010/02/28 13:10:43 jruoho Exp $ +# $NetBSD: ALL,v 1.245 2010/03/03 06:57:53 jruoho Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.244 $" +#ident "ALL-$Revision: 1.245 $" maxusers 64 # estimated number of users @@ -1766,7 +1766,6 @@ #options ACPI_DEBUG #options ACPI_DEBUG_ALLOC -options ACPI_EXTRA_DEBUG options ACPI_FDC_DEBUG options ACPI_MADT_DEBUG #options ACPI_MUTEX_DEBUG
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jruoho Date: Wed Mar 3 06:57:54 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Remove ACPI_EXTRA_DEBUG. To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Wed Mar 3 06:57:05 UTC 2010 Modified Files: src/sys/dev/acpi: acpi.c Log Message: Convert the single instance of ACPI_EXTRA_DEBUG to ACPIVERBOSE. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/dev/acpi/acpi.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.c diff -u src/sys/dev/acpi/acpi.c:1.151 src/sys/dev/acpi/acpi.c:1.152 --- src/sys/dev/acpi/acpi.c:1.151 Wed Mar 3 06:54:25 2010 +++ src/sys/dev/acpi/acpi.c Wed Mar 3 06:57:05 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.151 2010/03/03 06:54:25 jruoho Exp $ */ +/* $NetBSD: acpi.c,v 1.152 2010/03/03 06:57:05 jruoho Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.151 2010/03/03 06:54:25 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.152 2010/03/03 06:57:05 jruoho Exp $"); #include "opt_acpi.h" #include "opt_pcifixup.h" @@ -932,7 +932,7 @@ if ((ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0) return AE_OK; -#ifdef ACPI_EXTRA_DEBUG +#ifdef ACPIVERBOSE aprint_normal_dev(sc->sc_dev, "HID %s found in scope %s level %d\n", ad->ad_devinfo->HardwareId.String,
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Wed Mar 3 06:57:05 UTC 2010 Modified Files: src/sys/dev/acpi: acpi.c Log Message: Convert the single instance of ACPI_EXTRA_DEBUG to ACPIVERBOSE. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/dev/acpi/acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Wed Mar 3 06:54:25 UTC 2010 Modified Files: src/sys/dev/acpi: acpi.c Log Message: Refactor acpi_make_devnode() to make it a little more readable. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/sys/dev/acpi/acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Wed Mar 3 06:54:25 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c
Log Message:
Refactor acpi_make_devnode() to make it a little more readable.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/dev/acpi/acpi.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.c
diff -u src/sys/dev/acpi/acpi.c:1.150 src/sys/dev/acpi/acpi.c:1.151
--- src/sys/dev/acpi/acpi.c:1.150 Tue Mar 2 18:44:46 2010
+++ src/sys/dev/acpi/acpi.c Wed Mar 3 06:54:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.150 2010/03/02 18:44:46 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.151 2010/03/03 06:54:25 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.150 2010/03/02 18:44:46 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.151 2010/03/03 06:54:25 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -193,7 +193,8 @@
* Prototypes.
*/
static void acpi_build_tree(struct acpi_softc *);
-static ACPI_STATUS acpi_make_devnode(ACPI_HANDLE, UINT32, void *, void **);
+static ACPI_STATUS acpi_make_devnode(ACPI_HANDLE, uint32_t,
+ void *, void **);
static void acpi_enable_fixed_events(struct acpi_softc *);
@@ -851,96 +852,106 @@
* Make an ACPI devnode.
*/
static ACPI_STATUS
-acpi_make_devnode(ACPI_HANDLE handle, UINT32 level, void *context,
-void **status)
+acpi_make_devnode(ACPI_HANDLE handle, uint32_t level,
+void *context, void **status)
{
struct acpi_make_devnode_state *state = context;
-#if defined(ACPI_DEBUG) || defined(ACPI_EXTRA_DEBUG)
struct acpi_softc *sc = state->softc;
-#endif
struct acpi_scope *as = state->scope;
struct acpi_devnode *ad;
- ACPI_OBJECT_TYPE type;
ACPI_DEVICE_INFO *devinfo;
- ACPI_STATUS rv;
+ ACPI_OBJECT_TYPE type;
ACPI_NAME_UNION *anu;
- int i, clear = 0;
+ ACPI_STATUS rv;
+ int clear, i;
rv = AcpiGetType(handle, &type);
- if (ACPI_SUCCESS(rv)) {
- rv = AcpiGetObjectInfo(handle, &devinfo);
- if (ACPI_FAILURE(rv)) {
-#ifdef ACPI_DEBUG
- aprint_normal_dev(sc->sc_dev,
- "AcpiGetObjectInfo failed: %s\n",
- AcpiFormatException(rv));
-#endif
- goto out; /* XXX why return OK */
- }
- switch (type) {
- case ACPI_TYPE_DEVICE:
+ if (ACPI_FAILURE(rv))
+ return AE_OK; /* Do not terminate the walk. */
+
+ rv = AcpiGetObjectInfo(handle, &devinfo);
+
+ if (ACPI_FAILURE(rv)) {
+ aprint_debug_dev(sc->sc_dev, "failed to get object "
+ "information: %s\n", AcpiFormatException(rv));
+ return AE_OK;
+ }
+
+ switch (type) {
+
+ case ACPI_TYPE_DEVICE:
+
#ifdef ACPI_ACTIVATE_DEV
- if ((devinfo->Valid & (ACPI_VALID_STA|ACPI_VALID_HID)) ==
- (ACPI_VALID_STA|ACPI_VALID_HID) &&
- (devinfo->CurrentStatus &
- (ACPI_STA_DEV_PRESENT|ACPI_STA_DEV_ENABLED)) ==
- ACPI_STA_DEV_PRESENT)
-acpi_activate_device(handle, &devinfo);
+ if ((devinfo->Valid & (ACPI_VALID_STA | ACPI_VALID_HID)) ==
+ (ACPI_VALID_STA | ACPI_VALID_HID) &&
+ (devinfo->CurrentStatus &
+ (ACPI_STA_DEV_PRESENT | ACPI_STA_DEV_ENABLED)) ==
+ ACPI_STA_DEV_PRESENT)
+ acpi_activate_device(handle, &devinfo);
/* FALLTHROUGH */
#endif
- case ACPI_TYPE_PROCESSOR:
- case ACPI_TYPE_THERMAL:
- case ACPI_TYPE_POWER:
- ad = malloc(sizeof(*ad), M_ACPI, M_NOWAIT|M_ZERO);
- if (ad == NULL)
-return AE_NO_MEMORY;
-
- ad->ad_devinfo = devinfo;
- ad->ad_handle = handle;
- ad->ad_level = level;
- ad->ad_scope = as;
- ad->ad_type = type;
-
- anu = (ACPI_NAME_UNION *)&devinfo->Name;
- ad->ad_name[4] = '\0';
- for (i = 3, clear = 0; i >= 0; i--) {
-if (!clear && anu->Ascii[i] == '_')
- ad->ad_name[i] = '\0';
-else {
- ad->ad_name[i] = anu->Ascii[i];
- clear = 1;
-}
+ case ACPI_TYPE_PROCESSOR:
+ case ACPI_TYPE_THERMAL:
+ case ACPI_TYPE_POWER:
+
+ ad = malloc(sizeof(*ad), M_ACPI, M_NOWAIT | M_ZERO);
+
+ if (ad == NULL)
+ return AE_NO_MEMORY;
+
+ ad->ad_devinfo = devinfo;
+ ad->ad_handle = handle;
+ ad->ad_level = level;
+ ad->ad_scope = as;
+ ad->ad_type = type;
+
+ anu = (ACPI_NAME_UNION *)&devinfo->Name;
+ ad->ad_name[4] = '\0';
+
+ for (i = 3, clear = 0; i >= 0; i--) {
+
+ if (clear == 0 && anu->Ascii[i] == '_')
+ad->ad_name[i] = '\0';
+ else {
+ad->ad_name[i] = anu->Ascii[i];
+clear = 1;
}
- if (ad->ad_name[0] == '\0')
-ad->ad_name[0] = '_';
+ }
- TAILQ_INSERT_TAIL(&as->as_devnodes, ad, ad_list);
+ if (ad->ad_name[0] == '\0')
+ ad->ad_name[0] = '_';
- if (type == ACPI_TYPE_DEVICE &&
- (ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0)
-goto out;
+ TAILQ_INSERT_TAIL(&as->as_devnodes, ad, ad_list);
+
+ if (type != ACPI_TYPE_DEVICE)
+ return AE_OK;
+
+ if ((ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0)
+ return AE
CVS commit: src/sys/arch/sun3/sun3
Module Name:src Committed By: skrll Date: Wed Mar 3 06:53:35 UTC 2010 Modified Files: src/sys/arch/sun3/sun3: locore.s Log Message: s/cpu_fork/cpu_lwp_fork/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/sun3/sun3/locore.s 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/sun3/sun3/locore.s diff -u src/sys/arch/sun3/sun3/locore.s:1.91 src/sys/arch/sun3/sun3/locore.s:1.92 --- src/sys/arch/sun3/sun3/locore.s:1.91 Thu Dec 10 05:10:04 2009 +++ src/sys/arch/sun3/sun3/locore.s Wed Mar 3 06:53:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.91 2009/12/10 05:10:04 rmind Exp $ */ +/* $NetBSD: locore.s,v 1.92 2010/03/03 06:53:34 skrll Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -165,7 +165,7 @@ | is finished, to avoid spurrious interrupts. /* - * Create a fake exception frame so that cpu_fork() can copy it. + * Create a fake exception frame so that cpu_lwp_fork() can copy it. * main() nevers returns; we exit to user mode from a forked process * later on. */
CVS commit: src/sys/arch/sun3/sun3
Module Name:src Committed By: skrll Date: Wed Mar 3 06:53:35 UTC 2010 Modified Files: src/sys/arch/sun3/sun3: locore.s Log Message: s/cpu_fork/cpu_lwp_fork/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/sun3/sun3/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: mrg
Date: Wed Mar 3 03:48:40 UTC 2010
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: radeon_drv.c
Log Message:
make suspend/resume actually work:
- we have to DRM_LOCK()/DRM_UNLOCK(), thus s/rad_dev/dev/ in a variable name
- only call into radeon_cp_{stop,resume}() if the device is active
with this my nforce4 dual core amd system is able to suspend/resume with both
X and drm active.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.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/external/bsd/drm/dist/bsd-core/radeon_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.8 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.9
--- src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.8 Wed Feb 24 22:38:09 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c Wed Mar 3 03:48:39 2010
@@ -137,24 +137,33 @@
static bool
radeondrm_suspend(device_t self, const pmf_qual_t *qual)
{
- struct drm_device *rad_dev = device_private(self);
+ struct drm_device *dev = device_private(self);
drm_radeon_cp_stop_t stop_args;
+ bool rv = true;
stop_args.flush = stop_args.idle = 0;
- if (radeon_cp_stop(rad_dev, &stop_args, rad_dev->lock.file_priv) != 0)
- return false;
+ DRM_LOCK();
+ if (drm_find_file_by_proc(dev, curlwp->l_proc) &&
+ radeon_cp_stop(dev, &stop_args, dev->lock.file_priv) != 0)
+ rv = false;
+ DRM_UNLOCK();
- return true;
+ return rv;
}
static bool
radeondrm_resume(device_t self, const pmf_qual_t *qual)
{
- struct drm_device *rad_dev = device_private(self);
- if (radeon_cp_resume(rad_dev, NULL, NULL) != 0)
- return false;
+ struct drm_device *dev = device_private(self);
+ bool rv = true;
+
+ DRM_LOCK();
+ if (drm_find_file_by_proc(dev, curlwp->l_proc) &&
+ radeon_cp_resume(dev, NULL, NULL) != 0)
+ rv = false;
+ DRM_UNLOCK();
- return true;
+ return rv;
}
static int
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: mrg
Date: Wed Mar 3 03:48:40 UTC 2010
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: radeon_drv.c
Log Message:
make suspend/resume actually work:
- we have to DRM_LOCK()/DRM_UNLOCK(), thus s/rad_dev/dev/ in a variable name
- only call into radeon_cp_{stop,resume}() if the device is active
with this my nforce4 dual core amd system is able to suspend/resume with both
X and drm active.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc Committed By: macallan Date: Wed Mar 3 03:06:50 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-ati/dist/src: legacy_crtc.c Log Message: treat the onboard radeon found in Mac Minis like the ones found in iBooks >From Hiroaki Urata via PR 42931 To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c diff -u xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c:1.1.1.3 xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c:1.2 --- xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c:1.1.1.3 Mon Nov 9 00:51:53 2009 +++ xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c Wed Mar 3 03:06:50 2010 @@ -305,7 +305,8 @@ #if defined(__powerpc__) /* apparently restoring the pll causes a hang??? */ -if (info->MacModel == RADEON_MAC_IBOOK) +if ((info->MacModel == RADEON_MAC_IBOOK) || +(info->MacModel == RADEON_MAC_MINI_INTERNAL)) return; #endif @@ -1242,7 +1243,8 @@ #if defined(__powerpc__) /* apparently programming this otherwise causes a hang??? */ -if (info->MacModel == RADEON_MAC_IBOOK) +if ((info->MacModel == RADEON_MAC_IBOOK) || +(info->MacModel == RADEON_MAC_MINI_INTERNAL)) save->ppll_div_3 = 0x000600ad; else #endif
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc Committed By: macallan Date: Wed Mar 3 03:06:50 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-ati/dist/src: legacy_crtc.c Log Message: treat the onboard radeon found in Mac Minis like the ones found in iBooks >From Hiroaki Urata via PR 42931 To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: rmind Date: Wed Mar 3 02:09:51 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Mention support for Gumstix Verdex Pro and SMSC LAN9118 Family Ethernet driver, which were added by kiyoh...@. To generate a diff of this commit: cvs rdiff -u -r1.1365 -r1.1366 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1365 src/doc/CHANGES:1.1366 --- src/doc/CHANGES:1.1365 Sat Feb 27 22:17:15 2010 +++ src/doc/CHANGES Wed Mar 3 02:09:51 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1365 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1366 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -379,6 +379,8 @@ rumpvfs: Use unmodified kernel vnode pager. [pooka 20090806] zfs: Import OpenSolaris zfs source code to NetBSD, add NetBSD patches. [haad 20090808] + smsh(4): Add a SMSC LAN9118 Family Ethernet driver. [kiyohara 20090809] + evbarm: Support for Gumstix Verdex and Verdex Pro. [kiyohara 20090809] gpioiic(4): New driver to create an I2C bus using GPIO pins in bit-banging mode. [mbalmer 20090809] voyagerfb(8): a driver for the Gdium Liberty 1000's video controller
CVS commit: src/doc
Module Name:src Committed By: rmind Date: Wed Mar 3 02:09:51 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Mention support for Gumstix Verdex Pro and SMSC LAN9118 Family Ethernet driver, which were added by kiyoh...@. To generate a diff of this commit: cvs rdiff -u -r1.1365 -r1.1366 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/nbperf
Module Name:src Committed By: joerg Date: Wed Mar 3 01:55:04 UTC 2010 Modified Files: src/usr.bin/nbperf: graph2.c graph3.c nbperf.1 nbperf.c nbperf.h Log Message: Add a check for duplicate keys. The check is run once and quadratic in the hash collision chain length, which is expected to be fairly low. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/nbperf/graph2.c \ src/usr.bin/nbperf/graph3.c src/usr.bin/nbperf/nbperf.c \ src/usr.bin/nbperf/nbperf.h cvs rdiff -u -r1.1 -r1.2 src/usr.bin/nbperf/nbperf.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/nbperf
Module Name:src
Committed By: joerg
Date: Wed Mar 3 01:55:04 UTC 2010
Modified Files:
src/usr.bin/nbperf: graph2.c graph3.c nbperf.1 nbperf.c nbperf.h
Log Message:
Add a check for duplicate keys. The check is run once and quadratic in
the hash collision chain length, which is expected to be fairly low.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/nbperf/graph2.c \
src/usr.bin/nbperf/graph3.c src/usr.bin/nbperf/nbperf.c \
src/usr.bin/nbperf/nbperf.h
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/nbperf/nbperf.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/nbperf/graph2.c
diff -u src/usr.bin/nbperf/graph2.c:1.2 src/usr.bin/nbperf/graph2.c:1.3
--- src/usr.bin/nbperf/graph2.c:1.2 Sat Aug 22 17:52:17 2009
+++ src/usr.bin/nbperf/graph2.c Wed Mar 3 01:55:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: graph2.c,v 1.2 2009/08/22 17:52:17 joerg Exp $ */
+/* $NetBSD: graph2.c,v 1.3 2010/03/03 01:55:04 joerg Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,12 +32,13 @@
*/
#include
-__RCSID("$NetBSD: graph2.c,v 1.2 2009/08/22 17:52:17 joerg Exp $");
+__RCSID("$NetBSD: graph2.c,v 1.3 2010/03/03 01:55:04 joerg Exp $");
#include
#include
#include
#include
+#include
#include "nbperf.h"
#include "graph2.h"
@@ -71,6 +72,35 @@
graph->output_order = NULL;
}
+static int
+graph2_check_duplicates(struct nbperf *nbperf, struct graph2 *graph)
+{
+ struct vertex2 *v;
+ struct edge2 *e, *e2;
+ uint32_t i, j;
+
+ for (i = 0; i < graph->e; ++i) {
+ e = &graph->edges[i];
+ v = &graph->verts[e->left];
+ j = v->l_edge;
+ e2 = &graph->edges[j];
+ for (;;) {
+ if (i < j && e->right == e2->right &&
+ nbperf->keylens[i] == nbperf->keylens[j] &&
+ memcmp(nbperf->keys[i], nbperf->keys[j],
+ nbperf->keylens[i]) == 0) {
+nbperf->has_duplicates = 1;
+return -1;
+ }
+ if (e2->l_next == unused)
+break;
+ j = e2->l_next;
+ e2 = &graph->edges[j];
+ }
+ }
+ return 0;
+}
+
int
graph2_hash(struct nbperf *nbperf, struct graph2 *graph)
{
@@ -108,6 +138,11 @@
v->r_edge = i;
}
+ if (nbperf->first_round) {
+ nbperf->first_round = 0;
+ return graph2_check_duplicates(nbperf, graph);
+ }
+
return 0;
}
Index: src/usr.bin/nbperf/graph3.c
diff -u src/usr.bin/nbperf/graph3.c:1.2 src/usr.bin/nbperf/graph3.c:1.3
--- src/usr.bin/nbperf/graph3.c:1.2 Sat Aug 22 17:52:17 2009
+++ src/usr.bin/nbperf/graph3.c Wed Mar 3 01:55:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: graph3.c,v 1.2 2009/08/22 17:52:17 joerg Exp $ */
+/* $NetBSD: graph3.c,v 1.3 2010/03/03 01:55:04 joerg Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,12 +32,13 @@
*/
#include
-__RCSID("$NetBSD: graph3.c,v 1.2 2009/08/22 17:52:17 joerg Exp $");
+__RCSID("$NetBSD: graph3.c,v 1.3 2010/03/03 01:55:04 joerg Exp $");
#include
#include
#include
#include
+#include
#include "nbperf.h"
#include "graph3.h"
@@ -71,6 +72,36 @@
graph->output_order = NULL;
}
+static int
+graph3_check_duplicates(struct nbperf *nbperf, struct graph3 *graph)
+{
+ struct vertex3 *v;
+ struct edge3 *e, *e2;
+ uint32_t i, j;
+
+ for (i = 0; i < graph->e; ++i) {
+ e = &graph->edges[i];
+ v = &graph->verts[e->left];
+ j = v->l_edge;
+ e2 = &graph->edges[j];
+ for (;;) {
+ if (i < j && e->middle == e2->middle &&
+ e->right == e2->right &&
+ nbperf->keylens[i] == nbperf->keylens[j] &&
+ memcmp(nbperf->keys[i], nbperf->keys[j],
+ nbperf->keylens[i]) == 0) {
+nbperf->has_duplicates = 1;
+return -1;
+ }
+ if (e2->l_next == unused)
+break;
+ j = e2->l_next;
+ e2 = &graph->edges[j];
+ }
+ }
+ return 0;
+}
+
int
graph3_hash(struct nbperf *nbperf, struct graph3 *graph)
{
@@ -121,6 +152,11 @@
v->r_edge = i;
}
+ if (nbperf->first_round) {
+ nbperf->first_round = 0;
+ return graph3_check_duplicates(nbperf, graph);
+ }
+
return 0;
}
Index: src/usr.bin/nbperf/nbperf.c
diff -u src/usr.bin/nbperf/nbperf.c:1.2 src/usr.bin/nbperf/nbperf.c:1.3
--- src/usr.bin/nbperf/nbperf.c:1.2 Sat Aug 22 17:52:17 2009
+++ src/usr.bin/nbperf/nbperf.c Wed Mar 3 01:55:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nbperf.c,v 1.2 2009/08/22 17:52:17 joerg Exp $ */
+/* $NetBSD: nbperf.c,v 1.3 2010/03/03 01:55:04 joerg Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include
-__RCSID("$NetBSD: nbperf.c,v 1.2 2009/08/22 17:52:17 joerg Exp $");
+__RCSID("$NetBSD: nbperf.c,v 1.3 2010/03/03 01:55:04 joerg Exp $");
#include
#include
@@ -101,6 +101,8 @@
.map_output = NULL,
.output = NULL,
.static_hash = 0,
+ .first_round = 1,
+ .has_duplicates = 0,
};
FILE *input;
size_t curlen = 0, curalloc = 0;
@@ -217,6 +219,8 @@
looped = 0;
while ((*build_hash)(&nbperf)) {
+ if (nbpe
CVS commit: src/sys/miscfs/kernfs
Module Name:src Committed By: pooka Date: Wed Mar 3 01:26:01 UTC 2010 Modified Files: src/sys/miscfs/kernfs: files.kernfs Log Message: You have found a scroll of genocide --More-- What class of monsters do you wish to genocide? --More-- > fs_foo.h Wiped out all fs_foo.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/miscfs/kernfs/files.kernfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/kernfs
Module Name:src Committed By: pooka Date: Wed Mar 3 01:26:01 UTC 2010 Modified Files: src/sys/miscfs/kernfs: files.kernfs Log Message: You have found a scroll of genocide --More-- What class of monsters do you wish to genocide? --More-- > fs_foo.h Wiped out all fs_foo.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/miscfs/kernfs/files.kernfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/miscfs/kernfs/files.kernfs diff -u src/sys/miscfs/kernfs/files.kernfs:1.3 src/sys/miscfs/kernfs/files.kernfs:1.4 --- src/sys/miscfs/kernfs/files.kernfs:1.3 Sun Dec 11 12:24:51 2005 +++ src/sys/miscfs/kernfs/files.kernfs Wed Mar 3 01:26:01 2010 @@ -1,6 +1,6 @@ -# $NetBSD: files.kernfs,v 1.3 2005/12/11 12:24:51 christos Exp $ +# $NetBSD: files.kernfs,v 1.4 2010/03/03 01:26:01 pooka Exp $ -deffs fs_kernfs.h KERNFS # XXX +deffs KERNFS file miscfs/kernfs/kernfs_subr.c kernfs file miscfs/kernfs/kernfs_vfsops.c kernfs
CVS commit: src/sys/netkey
Module Name:src
Committed By: pooka
Date: Wed Mar 3 01:13:26 UTC 2010
Modified Files:
src/sys/netkey: key.c
Log Message:
Remove #ifdef KERNFS by using weak symbols. Notably, this approach
won't work when kernfs is a module. But then again, kernfs as a
module (i.e. current situation) doesn't contain IPSEC support, so
it's not really any worse either.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/netkey/key.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/netkey/key.c
diff -u src/sys/netkey/key.c:1.176 src/sys/netkey/key.c:1.177
--- src/sys/netkey/key.c:1.176 Sun Jan 31 00:43:37 2010
+++ src/sys/netkey/key.c Wed Mar 3 01:13:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.176 2010/01/31 00:43:37 hubertf Exp $ */
+/* $NetBSD: key.c,v 1.177 2010/03/03 01:13:26 pooka Exp $ */
/* $KAME: key.c,v 1.310 2003/09/08 02:23:44 itojun Exp $ */
/*
@@ -35,11 +35,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.176 2010/01/31 00:43:37 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.177 2010/03/03 01:13:26 pooka Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
-#include "fs_kernfs.h"
#include
#include
@@ -95,9 +94,7 @@
#endif
#include
-#ifdef KERNFS
#include
-#endif
#include
@@ -119,6 +116,11 @@
percpu_t *pfkeystat_percpu;
+void kernfs_netkey_entangling_noodles(void *);
+void kernfs_netkey_entangling_noodles(void *v) {}
+__weak_alias(kernfs_revoke_sa,kernfs_netkey_entangling_noodles);
+__weak_alias(kernfs_revoke_sp,kernfs_netkey_entangling_noodles);
+
/*
* Note on SA reference counting:
* - SAs that are not in DEAD state will have (total external reference + 1)
@@ -963,9 +965,7 @@
s = splsoftnet();
-#ifdef KERNFS
kernfs_revoke_sa(sav);
-#endif
if (__LIST_CHAINED(sav))
LIST_REMOVE(sav, chain);
@@ -1032,9 +1032,7 @@
s = splsoftnet(); /*called from softclock()*/
-#ifdef KERNFS
kernfs_revoke_sp(sp);
-#endif
{
struct ipsecrequest *isr = sp->req, *nextisr;
CVS commit: src/sys/netkey
Module Name:src Committed By: pooka Date: Wed Mar 3 01:13:26 UTC 2010 Modified Files: src/sys/netkey: key.c Log Message: Remove #ifdef KERNFS by using weak symbols. Notably, this approach won't work when kernfs is a module. But then again, kernfs as a module (i.e. current situation) doesn't contain IPSEC support, so it's not really any worse either. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/netkey/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/cardbus
Module Name:src
Committed By: dyoung
Date: Wed Mar 3 00:56:41 UTC 2010
Modified Files:
src/sys/dev/cardbus: rbus_ppb.c
Log Message:
Simplify interrupt (dis)establishment by two source transformations:
- cardbus_intr_disestablish(cc, cf, ih);
+ Cardbus_intr_disestablish(ct, ih);
- ih = cardbus_intr_establish(cc, cf, ...);
+ ih = Cardbus_intr_establish(ct, ...);
Compiles. Untested. Let me know if you use this hardware with NetBSD
any longer.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/cardbus/rbus_ppb.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/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.35 src/sys/dev/cardbus/rbus_ppb.c:1.36
--- src/sys/dev/cardbus/rbus_ppb.c:1.35 Fri Feb 26 00:57:02 2010
+++ src/sys/dev/cardbus/rbus_ppb.c Wed Mar 3 00:56:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.35 2010/02/26 00:57:02 dyoung Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.36 2010/03/03 00:56:41 dyoung Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.35 2010/02/26 00:57:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.36 2010/03/03 00:56:41 dyoung Exp $");
#include
#include
@@ -777,7 +777,7 @@
/* Map and establish the interrupt. */
- sc->sc_ih = cardbus_intr_establish(cc, cf, psc->sc_intrline, IPL_NET,
+ sc->sc_ih = Cardbus_intr_establish(ct, psc->sc_intrline, IPL_NET,
fxp_intr, sc);
if (NULL == sc->sc_ih) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt\n");
@@ -800,7 +800,7 @@
cardbus_function_tag_t cf = psc->sc_cf;
/* Remove interrupt handler. */
- cardbus_intr_disestablish(cc, cf, sc->sc_ih);
+ Cardbus_intr_disestablish(ct, sc->sc_ih);
Cardbus_function_disable(((struct fxp_cardbus_softc *) sc)->ct);
#endif
@@ -826,7 +826,7 @@
/*
* Unhook the interrupt handler.
*/
- cardbus_intr_disestablish(ct->ct_cc, ct->ct_cf, sc->sc_ih);
+ Cardbus_intr_disestablish(ct, sc->sc_ih);
/*
* release bus space and close window
CVS commit: src/sys/dev/cardbus
Module Name:src Committed By: dyoung Date: Wed Mar 3 00:56:41 UTC 2010 Modified Files: src/sys/dev/cardbus: rbus_ppb.c Log Message: Simplify interrupt (dis)establishment by two source transformations: - cardbus_intr_disestablish(cc, cf, ih); + Cardbus_intr_disestablish(ct, ih); - ih = cardbus_intr_establish(cc, cf, ...); + ih = Cardbus_intr_establish(ct, ...); Compiles. Untested. Let me know if you use this hardware with NetBSD any longer. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/cardbus/rbus_ppb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Wed Mar 3 00:49:39 UTC 2010
Modified Files:
src/sys/kern: kern_stub.c
Log Message:
Remove fs_lfs now that the syscall is always defined.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/kern/kern_stub.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/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.21 src/sys/kern/kern_stub.c:1.22
--- src/sys/kern/kern_stub.c:1.21 Tue Nov 3 05:23:28 2009
+++ src/sys/kern/kern_stub.c Wed Mar 3 00:49:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_stub.c,v 1.21 2009/11/03 05:23:28 dyoung Exp $ */
+/* $NetBSD: kern_stub.c,v 1.22 2010/03/03 00:49:39 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,15 +62,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.21 2009/11/03 05:23:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.22 2010/03/03 00:49:39 pooka Exp $");
#include "opt_ptrace.h"
#include "opt_ktrace.h"
#include "opt_modular.h"
#include "opt_sa.h"
-#ifdef _KERNEL_OPT
-#include "fs_lfs.h"
-#endif
/* XXX To get syscall prototypes. */
#define SYSVSHM
@@ -303,9 +300,7 @@
{ SYS_compat_50_settimeofday, "compat" },
{ SYS_compat_50_utimes, "compat" },
{ SYS_compat_50_adjtime, "compat" },
-#ifdef LFS
{ SYS_compat_50_lfs_segwait, "compat" },
-#endif
{ SYS_compat_50_futimes, "compat" },
{ SYS_compat_50_clock_gettime, "compat" },
{ SYS_compat_50_clock_settime, "compat" },
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Wed Mar 3 00:49:39 UTC 2010 Modified Files: src/sys/kern: kern_stub.c Log Message: Remove fs_lfs now that the syscall is always defined. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/kern/kern_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: yamt Date: Wed Mar 3 00:47:31 UTC 2010 Modified Files: src/sys/kern: kern_exit.c kern_ktrace.c kern_resource.c kern_runq.c kern_sig.c kern_synch.c vfs_syscalls.c Log Message: remove redundant checks of PK_MARKER. To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/sys/kern/kern_exit.c cvs rdiff -u -r1.150 -r1.151 src/sys/kern/kern_ktrace.c cvs rdiff -u -r1.154 -r1.155 src/sys/kern/kern_resource.c cvs rdiff -u -r1.29 -r1.30 src/sys/kern/kern_runq.c cvs rdiff -u -r1.303 -r1.304 src/sys/kern/kern_sig.c cvs rdiff -u -r1.279 -r1.280 src/sys/kern/kern_synch.c cvs rdiff -u -r1.403 -r1.404 src/sys/kern/vfs_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: yamt
Date: Wed Mar 3 00:47:31 UTC 2010
Modified Files:
src/sys/kern: kern_exit.c kern_ktrace.c kern_resource.c kern_runq.c
kern_sig.c kern_synch.c vfs_syscalls.c
Log Message:
remove redundant checks of PK_MARKER.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.150 -r1.151 src/sys/kern/kern_ktrace.c
cvs rdiff -u -r1.154 -r1.155 src/sys/kern/kern_resource.c
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/kern_runq.c
cvs rdiff -u -r1.303 -r1.304 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.279 -r1.280 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.403 -r1.404 src/sys/kern/vfs_syscalls.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/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.226 src/sys/kern/kern_exit.c:1.227
--- src/sys/kern/kern_exit.c:1.226 Mon Mar 1 21:10:15 2010
+++ src/sys/kern/kern_exit.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exit.c,v 1.226 2010/03/01 21:10:15 darran Exp $ */
+/* $NetBSD: kern_exit.c,v 1.227 2010/03/03 00:47:30 yamt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.226 2010/03/01 21:10:15 darran Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.227 2010/03/03 00:47:30 yamt Exp $");
#include "opt_ktrace.h"
#include "opt_perfctrs.h"
@@ -436,8 +436,6 @@
*/
if (__predict_false(p->p_slflag & PSL_CHTRACED)) {
PROCLIST_FOREACH(q, &allproc) {
- if ((q->p_flag & PK_MARKER) != 0)
-continue;
if (q->p_opptr == p)
q->p_opptr = NULL;
}
Index: src/sys/kern/kern_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.150 src/sys/kern/kern_ktrace.c:1.151
--- src/sys/kern/kern_ktrace.c:1.150 Fri Oct 2 21:47:35 2009
+++ src/sys/kern/kern_ktrace.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.150 2009/10/02 21:47:35 elad Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.151 2010/03/03 00:47:30 yamt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.150 2009/10/02 21:47:35 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.151 2010/03/03 00:47:30 yamt Exp $");
#include
#include
@@ -499,7 +499,7 @@
mutex_enter(proc_lock);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0 || p->p_tracep != ktd)
+ if (p->p_tracep != ktd)
continue;
mutex_enter(p->p_lock);
mutex_enter(&ktrace_lock);
Index: src/sys/kern/kern_resource.c
diff -u src/sys/kern/kern_resource.c:1.154 src/sys/kern/kern_resource.c:1.155
--- src/sys/kern/kern_resource.c:1.154 Fri Oct 2 22:46:18 2009
+++ src/sys/kern/kern_resource.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_resource.c,v 1.154 2009/10/02 22:46:18 elad Exp $ */
+/* $NetBSD: kern_resource.c,v 1.155 2010/03/03 00:47:30 yamt Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.154 2009/10/02 22:46:18 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.155 2010/03/03 00:47:30 yamt Exp $");
#include
#include
@@ -192,8 +192,6 @@
if (who == 0)
who = (int)kauth_cred_geteuid(l->l_cred);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
-continue;
mutex_enter(p->p_lock);
if (kauth_cred_geteuid(p->p_cred) ==
(uid_t)who && p->p_nice < low)
@@ -263,8 +261,6 @@
if (who == 0)
who = (int)kauth_cred_geteuid(l->l_cred);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
-continue;
mutex_enter(p->p_lock);
if (kauth_cred_geteuid(p->p_cred) ==
(uid_t)SCARG(uap, who)) {
Index: src/sys/kern/kern_runq.c
diff -u src/sys/kern/kern_runq.c:1.29 src/sys/kern/kern_runq.c:1.30
--- src/sys/kern/kern_runq.c:1.29 Wed Jan 13 01:57:17 2010
+++ src/sys/kern/kern_runq.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_runq.c,v 1.29 2010/01/13 01:57:17 mrg Exp $ */
+/* $NetBSD: kern_runq.c,v 1.30 2010/03/03 00:47:30 yamt Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.29 2010/01/13 01:57:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.30 2010/03/03 00:47:30 yamt Exp $");
#include
#include
@@ -892,8 +892,6 @@
"LID", "PRI", "EPRI", "FL", "ST", "LWP", "CPU", "TCI", "LRTICKS");
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
- continue;
(*pr)(" /- %d (%s)\n", (int)p->p_pid, p->p_comm);
LIST_FOREACH(l, &p->p_lwps, l_sibling) {
ci = l->l_cpu;
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.303 src/sys/kern/kern_sig.c:1.304
--- src/sys/kern/kern_sig.c:1.303 Mon Mar 1 2
CVS commit: src/sys/sys
Module Name:src Committed By: yamt Date: Wed Mar 3 00:45:55 UTC 2010 Modified Files: src/sys/sys: proc.h Log Message: comment To generate a diff of this commit: cvs rdiff -u -r1.295 -r1.296 src/sys/sys/proc.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/sys/proc.h diff -u src/sys/sys/proc.h:1.295 src/sys/sys/proc.h:1.296 --- src/sys/sys/proc.h:1.295 Sun Feb 21 02:11:39 2010 +++ src/sys/sys/proc.h Wed Mar 3 00:45:55 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.295 2010/02/21 02:11:39 darran Exp $ */ +/* $NetBSD: proc.h,v 1.296 2010/03/03 00:45:55 yamt Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -533,6 +533,10 @@ return p; } + +/* + * PROCLIST_FOREACH: iterate on the given proclist, skipping PK_MARKER ones. + */ #define PROCLIST_FOREACH(var, head) \ for ((var) = LIST_FIRST(head); \ ((var) = _proclist_skipmarker(var)) != NULL; \
CVS commit: src/sys/sys
Module Name:src Committed By: yamt Date: Wed Mar 3 00:45:55 UTC 2010 Modified Files: src/sys/sys: proc.h Log Message: comment To generate a diff of this commit: cvs rdiff -u -r1.295 -r1.296 src/sys/sys/proc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/iscsi/dist
Module Name:src Committed By: yamt Date: Wed Mar 3 00:44:52 UTC 2010 Modified Files: src/external/bsd/iscsi/dist/include: iscsiprotocol.h src/external/bsd/iscsi/dist/src/lib: disk.c target.c Log Message: fix multi-thread problems wrt read/write buffer. PR/42651. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/iscsi/dist/include/iscsiprotocol.h cvs rdiff -u -r1.5 -r1.6 src/external/bsd/iscsi/dist/src/lib/disk.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/iscsi/dist/src/lib/target.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/iscsi/dist
Module Name:src
Committed By: yamt
Date: Wed Mar 3 00:44:52 UTC 2010
Modified Files:
src/external/bsd/iscsi/dist/include: iscsiprotocol.h
src/external/bsd/iscsi/dist/src/lib: disk.c target.c
Log Message:
fix multi-thread problems wrt read/write buffer. PR/42651.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/iscsi/dist/include/iscsiprotocol.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/iscsi/dist/src/lib/disk.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/iscsi/dist/src/lib/target.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/include/iscsiprotocol.h
diff -u src/external/bsd/iscsi/dist/include/iscsiprotocol.h:1.1 src/external/bsd/iscsi/dist/include/iscsiprotocol.h:1.2
--- src/external/bsd/iscsi/dist/include/iscsiprotocol.h:1.1 Thu Jun 25 13:47:09 2009
+++ src/external/bsd/iscsi/dist/include/iscsiprotocol.h Wed Mar 3 00:44:51 2010
@@ -391,6 +391,7 @@
uint8_t *ahs;
uint8_t ahs_len;
uint8_t *send_data;
+ uint8_t *send_buffer; /* malloc'ed buffer for READ */
int32_t send_sg_len;
uint8_t *recv_data;
int32_t recv_sg_len;
Index: src/external/bsd/iscsi/dist/src/lib/disk.c
diff -u src/external/bsd/iscsi/dist/src/lib/disk.c:1.5 src/external/bsd/iscsi/dist/src/lib/disk.c:1.6
--- src/external/bsd/iscsi/dist/src/lib/disk.c:1.5 Wed Jan 20 10:33:08 2010
+++ src/external/bsd/iscsi/dist/src/lib/disk.c Wed Mar 3 00:44:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.c,v 1.5 2010/01/20 10:33:08 yamt Exp $ */
+/* $NetBSD: disk.c,v 1.6 2010/03/03 00:44:51 yamt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -100,6 +100,8 @@
#include
#endif
+#include
+
#ifdef HAVE_ERRNO_H
#include
#endif
@@ -149,7 +151,6 @@
typedef struct iscsi_disk_t {
int type; /* type of disk - fs/mmap and fs */
char filename[MAXPATHLEN]; /* filename for the disk */
- uint8_t *buffer; /* buffer for disk read/write ops */
uint64_t blockc; /* # of blocks */
uint64_t blocklen; /* block size */
uint64_t luns; /* # of luns */
@@ -859,7 +860,6 @@
}
idisk->size = de_getsize(&tp->de);
idisk->blockc = idisk->size / idisk->blocklen;
- NEWARRAY(uint8_t, idisk->buffer, MB(1), "buffer1", ;);
idisk->type = ISCSI_FS;
printf("DISK: %" PRIu64 " logical unit%s (%" PRIu64 " blocks, %"
PRIu64 " bytes/block), type %s\n",
@@ -1386,6 +1386,7 @@
uint64_tbyte_offset;
uint64_tbytec;
uint8_t*ptr;
+ int result;
byte_offset = lba * disks.v[sess->d].blocklen;
bytec = len * disks.v[sess->d].blocklen;
@@ -1402,7 +1403,7 @@
}
/* Assign ptr for write data */
- ptr = disks.v[sess->d].buffer;
+ ptr = malloc(MB(1));
/* Have target do data transfer */
sg.iov_base = ptr;
@@ -1410,7 +1411,8 @@
if (target_transfer_data(sess, args, &sg, 1) != 0) {
iscsi_err(__FILE__, __LINE__,
"target_transfer_data() failed\n");
- return -1;
+ result = -1;
+ goto out;
}
/* Finish up write */
if (de_lseek(&disks.v[sess->d].lunv->v[lun].de, (off_t)byte_offset,
@@ -1418,7 +1420,8 @@
iscsi_err(__FILE__, __LINE__,
"lseek() to offset %" PRIu64 " failed\n",
byte_offset);
- return -1;
+ result = -1;
+ goto out;
}
if (!target_writable(&disks.v[sess->d].lunv->v[lun])) {
iscsi_err(__FILE__, __LINE__,
@@ -1426,7 +1429,8 @@
PRIu64 ", size %" PRIu64 "[READONLY TARGET]\n",
bytec, byte_offset,
de_getsize(&disks.v[sess->d].lunv->v[lun].de));
- return -1;
+ result = -1;
+ goto out;
}
if ((uint64_t)de_write(&disks.v[sess->d].lunv->v[lun].de, ptr,
(unsigned) bytec) != bytec) {
@@ -1435,11 +1439,15 @@
PRIu64 ", size %" PRIu64 "\n",
bytec, byte_offset,
de_getsize(&disks.v[sess->d].lunv->v[lun].de));
- return -1;
+ result = -1;
+ goto out;
}
iscsi_trace(TRACE_SCSI_DATA,
"wrote %" PRIu64 " bytes to device OK\n", bytec);
- return 0;
+ result = 0;
+out:
+ free(ptr);
+ return result;
}
static int
@@ -1452,11 +1460,12 @@
uint8_t*ptr;
uint32_tn;
int rc;
+ int result;
+ assert(args->send_buffer == NULL);
byte_offset = lba * disks.v[sess->d].blocklen;
bytec = len * disks.v[sess->d].blocklen;
extra = 0;
- ptr = NULL;
if (len == 0) {
iscsi_err(__FILE__, __LINE__, "Zero \"len\"\n");
NO_CLEANUP;
@@ -1475,20 +1484,22 @@
NO_CLEANUP;
return -1;
}
- ptr = disks.v[sess->d].buffer;
+ ptr = malloc(MB(1));
n = 0;
do {
if (de_lseek(&disks.v[sess->d].lunv->v[lun].de,
(off_t)(n + byte_offset), SEEK_SET) == -1) {
iscsi_err(__FILE__, __LINE__, "lseek failed\n");
- return -1;
+ result = -1;
+ goto out;
}
rc = de_read(&disks.v[sess->d].lunv->v[lun].de, ptr + n,
(size_t)(bytec - n));
if (rc <= 0) {
iscsi_err(__FILE__, __LINE__,
"read failed: rc %d errno %d\n", rc, errno);
- return -1;
+ result = -1;
+ goto out;
}
n
CVS commit: src/sys/arch
Module Name:src Committed By: pooka Date: Wed Mar 3 00:30:16 UTC 2010 Modified Files: src/sys/arch/amigappc/amigappc: locore.S src/sys/arch/bebox/bebox: locore.S src/sys/arch/evbppc/ev64260: ev64260_locore.S src/sys/arch/evbppc/pmppc: pmppc_locore.S src/sys/arch/ibmnws/ibmnws: locore.S src/sys/arch/mvmeppc/mvmeppc: locore.S src/sys/arch/prep/prep: locore.S src/sys/arch/rs6000/rs6000: locore.S src/sys/arch/sandpoint/sandpoint: locore.S Log Message: Fix some historical powerpc curiocity which had kernfs depend on startsym/endsym, and which crept into most powerpc ports. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amigappc/amigappc/locore.S cvs rdiff -u -r1.20 -r1.21 src/sys/arch/bebox/bebox/locore.S cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/ev64260/ev64260_locore.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/pmppc/pmppc_locore.S cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ibmnws/ibmnws/locore.S cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvmeppc/mvmeppc/locore.S cvs rdiff -u -r1.14 -r1.15 src/sys/arch/prep/prep/locore.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/rs6000/rs6000/locore.S cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/sandpoint/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: pooka Date: Wed Mar 3 00:30:16 UTC 2010 Modified Files: src/sys/arch/amigappc/amigappc: locore.S src/sys/arch/bebox/bebox: locore.S src/sys/arch/evbppc/ev64260: ev64260_locore.S src/sys/arch/evbppc/pmppc: pmppc_locore.S src/sys/arch/ibmnws/ibmnws: locore.S src/sys/arch/mvmeppc/mvmeppc: locore.S src/sys/arch/prep/prep: locore.S src/sys/arch/rs6000/rs6000: locore.S src/sys/arch/sandpoint/sandpoint: locore.S Log Message: Fix some historical powerpc curiocity which had kernfs depend on startsym/endsym, and which crept into most powerpc ports. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amigappc/amigappc/locore.S cvs rdiff -u -r1.20 -r1.21 src/sys/arch/bebox/bebox/locore.S cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/ev64260/ev64260_locore.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/pmppc/pmppc_locore.S cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ibmnws/ibmnws/locore.S cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mvmeppc/mvmeppc/locore.S cvs rdiff -u -r1.14 -r1.15 src/sys/arch/prep/prep/locore.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/rs6000/rs6000/locore.S cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/sandpoint/locore.S 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/amigappc/amigappc/locore.S diff -u src/sys/arch/amigappc/amigappc/locore.S:1.19 src/sys/arch/amigappc/amigappc/locore.S:1.20 --- src/sys/arch/amigappc/amigappc/locore.S:1.19 Thu Feb 25 23:33:43 2010 +++ src/sys/arch/amigappc/amigappc/locore.S Wed Mar 3 00:30:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.19 2010/02/25 23:33:43 matt Exp $ */ +/* $NetBSD: locore.S,v 1.20 2010/03/03 00:30:15 pooka Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -36,7 +36,6 @@ * Rewritten for 4.0 and bootargs support by Frank Wille. */ #include "opt_ddb.h" -#include "fs_kernfs.h" #include "opt_ipkdb.h" #include "opt_lockdebug.h" #include "opt_multiprocessor.h" @@ -167,7 +166,7 @@ lis 6,_C_LABEL(end)+...@ha addi 6,6,_C_LABEL(end)+...@l rlwinm 7,6,0,0,29 /* startsym = end - 32-bit alignment */ -#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS) +#if NKSYMS || defined(DDB) || defined(MODULAR) lis 8,_C_LABEL(startsym)@ha stw 7,_C_LABEL(startsym)@l(8) mr. 27,27 /* esym == 0 ? */ Index: src/sys/arch/bebox/bebox/locore.S diff -u src/sys/arch/bebox/bebox/locore.S:1.20 src/sys/arch/bebox/bebox/locore.S:1.21 --- src/sys/arch/bebox/bebox/locore.S:1.20 Thu Feb 25 23:33:44 2010 +++ src/sys/arch/bebox/bebox/locore.S Wed Mar 3 00:30:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.20 2010/02/25 23:33:44 matt Exp $ */ +/* $NetBSD: locore.S,v 1.21 2010/03/03 00:30:15 pooka Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -33,7 +33,6 @@ */ #include "opt_ddb.h" -#include "fs_kernfs.h" #include "opt_ipkdb.h" #include "opt_lockdebug.h" #include "opt_modular.h" @@ -153,7 +152,7 @@ __start_cpu0: /* compute end of kernel memory */ -#if defined(DDB) || defined(KERNFS) || NKSYMS || defined(MODULAR) +#if defined(DDB) || NKSYMS || defined(MODULAR) lis 7,_C_LABEL(startsym)@ha addi 7,7,_C_LABEL(startsym)@l stw 3,0(7) Index: src/sys/arch/evbppc/ev64260/ev64260_locore.S diff -u src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.14 src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.15 --- src/sys/arch/evbppc/ev64260/ev64260_locore.S:1.14 Sat Feb 27 22:12:31 2010 +++ src/sys/arch/evbppc/ev64260/ev64260_locore.S Wed Mar 3 00:30:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ev64260_locore.S,v 1.14 2010/02/27 22:12:31 snj Exp $ */ +/* $NetBSD: ev64260_locore.S,v 1.15 2010/03/03 00:30:15 pooka Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -33,7 +33,6 @@ */ #include "opt_ddb.h" -#include "fs_kernfs.h" #include "opt_ppcparam.h" #include "opt_ipkdb.h" #include "opt_modular.h" @@ -214,7 +213,7 @@ /* compute end of kernel memory */ lis 8,_C_LABEL(end)@ha addi 8,8,_C_LABEL(end)@l -#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KERNFS) +#if NKSYMS || defined(DDB) || defined(MODULAR) lis 7,_C_LABEL(startsym)@ha addi 7,7,_C_LABEL(startsym)@l stw 3,0(7) Index: src/sys/arch/evbppc/pmppc/pmppc_locore.S diff -u src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.6 src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.7 --- src/sys/arch/evbppc/pmppc/pmppc_locore.S:1.6 Sat Feb 27 22:12:31 2010 +++ src/sys/arch/evbppc/pmppc/pmppc_locore.S Wed Mar 3 00:30:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmppc_locore.S,v 1.6 2010/02/27 22:12:31 snj Exp $ */ +/* $NetBSD: pmppc_locore.S,v 1.7 2010/03/03 00:30:15 pooka Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -34,7 +34,6 @@ #include "opt_ddb.h" #include "opt_kgdb.h" -#include "fs_kernfs.h" #include "opt_ipkdb.h" #include "opt_multipr
CVS commit: src/sys/arch/xen/x86
Module Name:src
Committed By: jym
Date: Wed Mar 3 00:09:03 UTC 2010
Modified Files:
src/sys/arch/xen/x86: cpu.c
Log Message:
Use roundup2() instead of hardcoding the CACHE_LINE_SIZE rounding
operation.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/x86/cpu.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/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.41 src/sys/arch/xen/x86/cpu.c:1.42
--- src/sys/arch/xen/x86/cpu.c:1.41 Wed Feb 24 22:37:55 2010
+++ src/sys/arch/xen/x86/cpu.c Wed Mar 3 00:09:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.41 2010/02/24 22:37:55 dyoung Exp $ */
+/* $NetBSD: cpu.c,v 1.42 2010/03/03 00:09:03 jym Exp $ */
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.41 2010/02/24 22:37:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.42 2010/03/03 00:09:03 jym Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -236,8 +236,7 @@
aprint_naive(": Application Processor\n");
ptr = (uintptr_t)kmem_zalloc(sizeof(*ci) + CACHE_LINE_SIZE - 1,
KM_SLEEP);
- ci = (struct cpu_info *)((ptr + CACHE_LINE_SIZE - 1) &
- ~(CACHE_LINE_SIZE - 1));
+ ci = (struct cpu_info *)roundup2(ptr, CACHE_LINE_SIZE);
ci->ci_curldt = -1;
} else {
aprint_naive(": %s Processor\n",
@@ -372,8 +371,7 @@
aprint_naive(": Application Processor\n");
ptr = (uintptr_t)kmem_alloc(sizeof(*ci) + CACHE_LINE_SIZE - 1,
KM_SLEEP);
- ci = (struct cpu_info *)((ptr + CACHE_LINE_SIZE - 1) &
- ~(CACHE_LINE_SIZE - 1));
+ ci = (struct cpu_info *)roundup2(ptr, CACHE_LINE_SIZE);
memset(ci, 0, sizeof(*ci));
#ifdef TRAPLOG
ci->ci_tlog_base = kmem_zalloc(sizeof(struct tlog), KM_SLEEP);
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: jym Date: Wed Mar 3 00:09:03 UTC 2010 Modified Files: src/sys/arch/xen/x86: cpu.c Log Message: Use roundup2() instead of hardcoding the CACHE_LINE_SIZE rounding operation. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/x86/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/ffs
Module Name:src
Committed By: pooka
Date: Wed Mar 3 00:01:21 UTC 2010
Modified Files:
src/sys/modules/ffs: Makefile
Log Message:
-DFFS is no longer necessary
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/ffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.3 src/sys/modules/ffs/Makefile:1.4
--- src/sys/modules/ffs/Makefile:1.3 Sun Feb 22 20:28:06 2009
+++ src/sys/modules/ffs/Makefile Wed Mar 3 00:01:20 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2009/02/22 20:28:06 ad Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/03 00:01:20 pooka Exp $
.include "../Makefile.inc"
.PATH: ${S}/ufs/ffs
KMOD= ffs
-CPPFLAGS+= -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DFFS
+CPPFLAGS+= -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA
.PATH: ${S}/ufs/ufs
SRCS= ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_ihash.c ufs_inode.c \
CVS commit: src/sys/modules/ffs
Module Name:src Committed By: pooka Date: Wed Mar 3 00:01:21 UTC 2010 Modified Files: src/sys/modules/ffs: Makefile Log Message: -DFFS is no longer necessary To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/ffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/nfs
Module Name:src Committed By: pooka Date: Tue Mar 2 23:49:11 UTC 2010 Modified Files: src/sys/nfs: files.nfs Log Message: don't create unused fs_nfs.h To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/nfs/files.nfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/nfs
Module Name:src Committed By: pooka Date: Tue Mar 2 23:49:11 UTC 2010 Modified Files: src/sys/nfs: files.nfs Log Message: don't create unused fs_nfs.h To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/nfs/files.nfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/nfs/files.nfs diff -u src/sys/nfs/files.nfs:1.12 src/sys/nfs/files.nfs:1.13 --- src/sys/nfs/files.nfs:1.12 Tue Mar 2 23:19:09 2010 +++ src/sys/nfs/files.nfs Tue Mar 2 23:49:11 2010 @@ -1,6 +1,6 @@ -# $NetBSD: files.nfs,v 1.12 2010/03/02 23:19:09 pooka Exp $ +# $NetBSD: files.nfs,v 1.13 2010/03/02 23:49:11 pooka Exp $ -deffs fs_nfs.h NFS +deffsNFS defflag opt_nfs_boot.h NFS_BOOT_BOOTP NFS_BOOT_BOOTPARAM NFS_BOOT_DHCP NFS_BOOT_GATEWAY NFS_BOOT_TCP
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Tue Mar 2 23:37:16 UTC 2010
Modified Files:
src/sys/modules/nfs: Makefile
src/sys/modules/nfsserver: Makefile
src/sys/rump/fs/lib/libnfs: Makefile
src/sys/rump/fs/lib/libnfsserver: Makefile
Removed Files:
src/sys/rump/fs/lib/libnfs: fs_nfs.h
Log Message:
Reflect removal of fs_nfs.h and -DNFS
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/nfs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/nfsserver/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/fs/lib/libnfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnfs/fs_nfs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/lib/libnfsserver/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/nfs/Makefile
diff -u src/sys/modules/nfs/Makefile:1.1 src/sys/modules/nfs/Makefile:1.2
--- src/sys/modules/nfs/Makefile:1.1 Wed Nov 19 18:36:09 2008
+++ src/sys/modules/nfs/Makefile Tue Mar 2 23:37:16 2010
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.1 2008/11/19 18:36:09 ad Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/02 23:37:16 pooka Exp $
.include "../Makefile.inc"
KMOD= nfs
-CPPFLAGS+= -DNFS -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM -DARP=1
+CPPFLAGS+= -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM -DARP=1
.PATH: ${S}/nfs
SRCS+= krpc_subr.c nfs_bio.c nfs_boot.c nfs_kq.c nfs_node.c
SRCS+= nfs_socket.c nfs_subs.c nfs_iod.c nfs_vnops.c
SRCS+= nfs_vfsops.c nfs_bootdhcp.c nfs_bootparam.c
+SRCS+= nfs_clntsocket.c nfs_clntsubs.c
.include
Index: src/sys/modules/nfsserver/Makefile
diff -u src/sys/modules/nfsserver/Makefile:1.1 src/sys/modules/nfsserver/Makefile:1.2
--- src/sys/modules/nfsserver/Makefile:1.1 Wed Nov 19 18:36:09 2008
+++ src/sys/modules/nfsserver/Makefile Tue Mar 2 23:37:16 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2008/11/19 18:36:09 ad Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/02 23:37:16 pooka Exp $
.include "../Makefile.inc"
KMOD= nfsserver
-CPPFLAGS+= -DNFS -DNFSSERVER
+CPPFLAGS+= -DNFSSERVER
.PATH: ${S}/nfs
Index: src/sys/rump/fs/lib/libnfs/Makefile
diff -u src/sys/rump/fs/lib/libnfs/Makefile:1.10 src/sys/rump/fs/lib/libnfs/Makefile:1.11
--- src/sys/rump/fs/lib/libnfs/Makefile:1.10 Tue Feb 16 20:42:46 2010
+++ src/sys/rump/fs/lib/libnfs/Makefile Tue Mar 2 23:37:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/02/16 20:42:46 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/02 23:37:16 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../nfs
@@ -6,12 +6,12 @@
LIB= rumpfs_nfs
SRCS= krpc_subr.c nfs_bio.c nfs_boot.c nfs_kq.c nfs_node.c \
- nfs_socket.c nfs_subs.c nfs_iod.c nfs_vfsops.c nfs_vnops.c \
- nfs_bootdhcp.c nfs_bootparam.c
+ nfs_socket.c nfs_clntsocket.c nfs_clntsubs.c nfs_subs.c \
+ nfs_iod.c nfs_vfsops.c nfs_vnops.c nfs_bootdhcp.c nfs_bootparam.c
CPPFLAGS+= -I${.CURDIR}/../../../net/lib/libnet/opt
CPPFLAGS+= -I${.CURDIR}/../../../net/lib/libnetinet/opt
-CPPFLAGS+= -DNFS -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM
+CPPFLAGS+= -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM
.include
.include
Index: src/sys/rump/fs/lib/libnfsserver/Makefile
diff -u src/sys/rump/fs/lib/libnfsserver/Makefile:1.2 src/sys/rump/fs/lib/libnfsserver/Makefile:1.3
--- src/sys/rump/fs/lib/libnfsserver/Makefile:1.2 Tue Feb 16 20:42:46 2010
+++ src/sys/rump/fs/lib/libnfsserver/Makefile Tue Mar 2 23:37:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:46 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/02 23:37:16 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../nfs
@@ -8,7 +8,5 @@
SRCS= nfs_export.c nfs_serv.c nfs_srvcache.c nfs_srvsubs.c \
nfs_srvsocket.c nfs_syscalls.c
-CPPFLAGS+= -DNFS
-
.include
.include
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Tue Mar 2 23:37:16 UTC 2010 Modified Files: src/sys/modules/nfs: Makefile src/sys/modules/nfsserver: Makefile src/sys/rump/fs/lib/libnfs: Makefile src/sys/rump/fs/lib/libnfsserver: Makefile Removed Files: src/sys/rump/fs/lib/libnfs: fs_nfs.h Log Message: Reflect removal of fs_nfs.h and -DNFS To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/nfs/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/modules/nfsserver/Makefile cvs rdiff -u -r1.10 -r1.11 src/sys/rump/fs/lib/libnfs/Makefile cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnfs/fs_nfs.h cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/lib/libnfsserver/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/nfs
Module Name:src Committed By: pooka Date: Tue Mar 2 23:19:09 UTC 2010 Modified Files: src/sys/nfs: files.nfs nfs.h nfs_bootparam.c nfs_socket.c nfs_subs.c nfs_var.h nfs_vfsops.c Added Files: src/sys/nfs: nfs_clntsocket.c nfs_clntsubs.c Log Message: Get rid of dependency on fs_nfs.h, i.e. source modules with conditional content depending on if the NFS client is wanted or not. The server can now be made an independent module not depending on the nfs client. Tested with rump_nfs (standalone client), rump_nfsd (standalone nfsd) and a qemu installation with both the client and the server. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/nfs/files.nfs cvs rdiff -u -r1.71 -r1.72 src/sys/nfs/nfs.h cvs rdiff -u -r1.35 -r1.36 src/sys/nfs/nfs_bootparam.c cvs rdiff -u -r0 -r1.1 src/sys/nfs/nfs_clntsocket.c \ src/sys/nfs/nfs_clntsubs.c cvs rdiff -u -r1.186 -r1.187 src/sys/nfs/nfs_socket.c cvs rdiff -u -r1.218 -r1.219 src/sys/nfs/nfs_subs.c cvs rdiff -u -r1.89 -r1.90 src/sys/nfs/nfs_var.h cvs rdiff -u -r1.210 -r1.211 src/sys/nfs/nfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/ufs/mfs
On Tue Mar 02 2010 at 23:02:25 +0100, Bernd Ernesti wrote: > On Tue, Mar 02, 2010 at 05:20:03PM +, Antti Kantee wrote: > > Module Name:src > > Committed By: pooka > > Date: Tue Mar 2 17:20:03 UTC 2010 > > > > Modified Files: > > src/sys/ufs/mfs: mfs_extern.h mfs_vfsops.c > > Added Files: > > src/sys/ufs/mfs: mfs_miniroot.c > > > > Log Message: > > Make mfs_initminiroot() mandatory. Allows to remove #ifdef MFS. > > Who will this and the following change work if I have no > 'file-system MFS' in my kernel config? yes
Re: CVS commit: src/sys/ufs/mfs
On Tue, Mar 02, 2010 at 05:20:03PM +, Antti Kantee wrote: > Module Name: src > Committed By: pooka > Date: Tue Mar 2 17:20:03 UTC 2010 > > Modified Files: > src/sys/ufs/mfs: mfs_extern.h mfs_vfsops.c > Added Files: > src/sys/ufs/mfs: mfs_miniroot.c > > Log Message: > Make mfs_initminiroot() mandatory. Allows to remove #ifdef MFS. Who will this and the following change work if I have no 'file-system MFS' in my kernel config? Bernd
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: darran Date: Tue Mar 2 22:00:32 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: DTrace: another fix for OS X builds, stdint.h location. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/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/external/cddl/osnet/sys/sys/types.h diff -u src/external/cddl/osnet/sys/sys/types.h:1.8 src/external/cddl/osnet/sys/sys/types.h:1.9 --- src/external/cddl/osnet/sys/sys/types.h:1.8 Tue Mar 2 21:08:36 2010 +++ src/external/cddl/osnet/sys/sys/types.h Tue Mar 2 22:00:32 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.8 2010/03/02 21:08:36 darran Exp $ */ +/* $NetBSD: types.h,v 1.9 2010/03/02 22:00:32 darran Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -63,8 +63,11 @@ /* * This is a bag of dirty hacks to keep things compiling. */ - +#ifdef __APPLE__ #include +#else +#include +#endif #include_next #include_next
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: darran Date: Tue Mar 2 22:00:32 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: types.h Log Message: DTrace: another fix for OS X builds, stdint.h location. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: matt Date: Tue Mar 2 21:54:06 UTC 2010 Modified Files: src/distrib/sets/lists/comp: md.amigappc md.bebox md.evbppc md.ibmnws md.macppc md.mvmeppc md.ofppc md.prep md.rs6000 md.sandpoint Log Message: Make machine/spr.h as obsolete. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/md.amigappc cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/comp/md.bebox cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/md.evbppc \ src/distrib/sets/lists/comp/md.ofppc cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/comp/md.ibmnws cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/comp/md.macppc cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/md.mvmeppc cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/comp/md.prep cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/comp/md.rs6000 cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.sandpoint Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.amigappc diff -u src/distrib/sets/lists/comp/md.amigappc:1.5 src/distrib/sets/lists/comp/md.amigappc:1.6 --- src/distrib/sets/lists/comp/md.amigappc:1.5 Tue Feb 2 14:13:16 2010 +++ src/distrib/sets/lists/comp/md.amigappc Tue Mar 2 21:54:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amigappc,v 1.5 2010/02/02 14:13:16 phx Exp $ +# $NetBSD: md.amigappc,v 1.6 2010/03/02 21:54:06 matt Exp $ ./usr/include/ieeefp.hcomp-c-include ./usr/include/amigappccomp-c-include ./usr/include/amigappc/_G_config.h comp-obsolete obsolete @@ -53,7 +53,7 @@ ./usr/include/amigappc/rwlock.h comp-c-include ./usr/include/amigappc/setjmp.h comp-c-include ./usr/include/amigappc/signal.h comp-c-include -./usr/include/amigappc/spr.h comp-c-include +./usr/include/amigappc/spr.h comp-obsolete obsolete ./usr/include/amigappc/stdarg.h comp-c-include ./usr/include/amigappc/trap.h comp-c-include ./usr/include/amigappc/types.h comp-c-include Index: src/distrib/sets/lists/comp/md.bebox diff -u src/distrib/sets/lists/comp/md.bebox:1.30 src/distrib/sets/lists/comp/md.bebox:1.31 --- src/distrib/sets/lists/comp/md.bebox:1.30 Fri Aug 22 13:42:19 2008 +++ src/distrib/sets/lists/comp/md.bebox Tue Mar 2 21:54:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.bebox,v 1.30 2008/08/22 13:42:19 lukem Exp $ +# $NetBSD: md.bebox,v 1.31 2010/03/02 21:54:06 matt Exp $ ./usr/include/beboxcomp-c-include ./usr/include/bebox/_G_config.h comp-obsolete obsolete ./usr/include/bebox/ansi.h comp-c-include @@ -57,7 +57,7 @@ ./usr/include/bebox/setjmp.h comp-c-include ./usr/include/bebox/signal.h comp-c-include ./usr/include/bebox/spkr.h comp-c-include -./usr/include/bebox/spr.h comp-c-include +./usr/include/bebox/spr.h comp-obsolete obsolete ./usr/include/bebox/stdarg.h comp-c-include ./usr/include/bebox/trap.h comp-c-include ./usr/include/bebox/types.h comp-c-include Index: src/distrib/sets/lists/comp/md.evbppc diff -u src/distrib/sets/lists/comp/md.evbppc:1.9 src/distrib/sets/lists/comp/md.evbppc:1.10 --- src/distrib/sets/lists/comp/md.evbppc:1.9 Fri Feb 9 22:49:47 2007 +++ src/distrib/sets/lists/comp/md.evbppc Tue Mar 2 21:54:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.9 2007/02/09 22:49:47 ad Exp $ +# $NetBSD: md.evbppc,v 1.10 2010/03/02 21:54:06 matt Exp $ ./usr/include/evbppccomp-c-include ./usr/include/evbppc/_G_config.h comp-obsolete obsolete ./usr/include/evbppc/ansi.h comp-c-include @@ -48,7 +48,7 @@ ./usr/include/evbppc/rwlock.h comp-c-include ./usr/include/evbppc/setjmp.h comp-c-include ./usr/include/evbppc/signal.h comp-c-include -./usr/include/evbppc/spr.h comp-c-include +./usr/include/evbppc/spr.h comp-obsolete obsolete ./usr/include/evbppc/stdarg.h comp-c-include ./usr/include/evbppc/trap.h comp-c-include ./usr/include/evbppc/types.h comp-c-include Index: src/distrib/sets/lists/comp/md.ofppc diff -u src/distrib/sets/lists/comp/md.ofppc:1.9 src/distrib/sets/lists/comp/md.ofppc:1.10 --- src/distrib/sets/lists/comp/md.ofppc:1.9 Fri Feb 9 22:49:47 2007 +++ src/distrib/sets/lists/comp/md.ofppc Tue Mar 2 21:54:06 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.ofppc,v 1.9 2007/02/09 22:49:47 ad Exp $ +# $NetBSD: md.ofppc,v 1.10 2010/03/02 21:54:06 matt Exp $ ./usr/include/ieeefp.hcomp-c-include ./usr/include/ofppccomp-c-include ./usr/include/ofppc/_G_config.h comp-obsolete obsolete @@ -47,7 +47,7 @@ ./usr/include/ofppc/rwlock.h comp-c-include ./usr/include/ofppc/setjmp.h comp-c-include ./usr/include/ofppc/signal.h comp-c-include -./usr/include/ofppc/spr.h comp-c-include +./usr/include/ofppc/spr.h comp-obsolete obsolete ./usr/include/ofppc/stdarg.h comp-c-include ./usr/include/ofppc/trap.h comp-c-include ./usr/include/ofppc/types.h comp-c-include Index: src/distrib/sets/lists/comp/md.ibmnws diff -u src/distrib/sets/lists/comp/md.i
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: matt Date: Tue Mar 2 21:54:06 UTC 2010 Modified Files: src/distrib/sets/lists/comp: md.amigappc md.bebox md.evbppc md.ibmnws md.macppc md.mvmeppc md.ofppc md.prep md.rs6000 md.sandpoint Log Message: Make machine/spr.h as obsolete. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/md.amigappc cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/comp/md.bebox cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/md.evbppc \ src/distrib/sets/lists/comp/md.ofppc cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/comp/md.ibmnws cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/comp/md.macppc cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/md.mvmeppc cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/comp/md.prep cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/comp/md.rs6000 cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.sandpoint Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Tue Mar 2 21:53:20 UTC 2010
Modified Files:
src/sys/arch/powerpc/powerpc: kgdb_machdep.c
Log Message:
Add missing to a few files missed on the first pass.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/powerpc/kgdb_machdep.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/powerpc/powerpc/kgdb_machdep.c
diff -u src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.21 src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.22
--- src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.21 Sun Jan 11 23:20:37 2009
+++ src/sys/arch/powerpc/powerpc/kgdb_machdep.c Tue Mar 2 21:53:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.21 2009/01/11 23:20:37 cegger Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.22 2010/03/02 21:53:20 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.21 2009/01/11 23:20:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.22 2010/03/02 21:53:20 matt Exp $");
#include "opt_ddb.h"
@@ -54,8 +54,23 @@
#include
#include
-#include
#include
+#if defined (PPC_OEA) || defined (PPC_OEA601) || defined (PPC_OEA64_BRIDGE)
+#include
+#include
+
+#elif defined (PPC_OEA64)
+#include
+
+#elif defined (PPC_IBM4XX)
+#include
+
+#elif defined (PPC_BOOKE)
+#include
+
+#else
+#error unknown architecture
+#endif
/*
* Determine if the memory at va..(va+len) is valid.
@@ -66,7 +81,7 @@
vaddr_t last_va;
paddr_t pa;
u_int msr;
-#if !defined (PPC_OEA64) && !defined (PPC_IBM4XX)
+#if defined (PPC_OEA) || defined (PPC_OEA601) || defined (PPC_OEA64_BRIDGE)
u_int batu, batl;
#endif
@@ -76,7 +91,7 @@
return 1;
}
-#if !defined (PPC_OEA64) && !defined (PPC_IBM4XX)
+#if defined (PPC_OEA) || defined (PPC_OEA601) || defined (PPC_OEA64_BRIDGE)
/* Now check battable registers */
#ifdef PPC_OEA601
if ((mfpvr() >> 16) == MPC601) {
@@ -129,7 +144,7 @@
}
#endif
}
-#endif /* !defined (PPC_OEA64) && !defined (PPC_IBM4XX) */
+#endif /* PPC_OEA || PPC_OEA601 || PPC_OEA64_BRIDGE */
#if defined(PPC_IBM4XX)
/* Is it (supposed to be) TLB-reserved mapping? */
@@ -163,7 +178,7 @@
kgdb_signal(int type)
{
switch (type) {
-#ifdef PPC_IBM4XX
+#if defined (PPC_IBM4XX) || defined (PPC_BOOKE)
case EXC_PIT: /* 40x - Programmable interval timer */
case EXC_FIT: /* 40x - Fixed interval timer */
return SIGALRM;
@@ -178,7 +193,7 @@
return SIGSEGV;
#endif
-#if !defined(PPC_OEA64) && !defined (PPC_IBM4XX)
+#if defined (PPC_OEA) || defined (PPC_OEA601) || defined (PPC_OEA64_BRIDGE)
case EXC_PERF: /* 604/750/7400 - Performance monitoring */
case EXC_BPT: /* 604/750/7400 - Instruction breakpoint */
case EXC_SMI: /* 604/750/7400 - System management interrupt */
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: matt Date: Tue Mar 2 21:53:20 UTC 2010 Modified Files: src/sys/arch/powerpc/powerpc: kgdb_machdep.c Log Message: Add missing to a few files missed on the first pass. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/powerpc/kgdb_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Tue Mar 2 21:52:33 UTC 2010 Modified Files: src/sys/arch/macppc/macppc: cpu.c src/sys/arch/mvmeppc/stand/libsa: srt0.S src/sys/arch/ofppc/ofppc: cpu.c src/sys/arch/powerpc/include: Makefile src/sys/arch/prep/prep: locore.S src/sys/arch/prep/stand/boot: boot.c clock.c src/sys/arch/rs6000/stand/boot: boot.c clock.c src/sys/arch/sandpoint/stand/netboot: entry.S Removed Files: src/sys/arch/amigappc/include: spr.h src/sys/arch/bebox/include: spr.h src/sys/arch/evbppc/include: spr.h src/sys/arch/ibmnws/include: spr.h src/sys/arch/macppc/include: spr.h src/sys/arch/mvmeppc/include: spr.h src/sys/arch/ofppc/include: spr.h src/sys/arch/prep/include: spr.h src/sys/arch/rs6000/include: spr.h src/sys/arch/sandpoint/include: spr.h Log Message: Add missing to a few files missed on the first pass. Don't export to userland, only To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/arch/amigappc/include/spr.h cvs rdiff -u -r1.4 -r0 src/sys/arch/bebox/include/spr.h cvs rdiff -u -r1.4 -r0 src/sys/arch/evbppc/include/spr.h cvs rdiff -u -r1.2 -r0 src/sys/arch/ibmnws/include/spr.h cvs rdiff -u -r1.4 -r0 src/sys/arch/macppc/include/spr.h cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/macppc/cpu.c cvs rdiff -u -r1.4 -r0 src/sys/arch/mvmeppc/include/spr.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mvmeppc/stand/libsa/srt0.S cvs rdiff -u -r1.4 -r0 src/sys/arch/ofppc/include/spr.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ofppc/ofppc/cpu.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/include/Makefile cvs rdiff -u -r1.4 -r0 src/sys/arch/prep/include/spr.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/prep/prep/locore.S cvs rdiff -u -r1.16 -r1.17 src/sys/arch/prep/stand/boot/boot.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/stand/boot/clock.c cvs rdiff -u -r1.1 -r0 src/sys/arch/rs6000/include/spr.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/stand/boot/boot.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/stand/boot/clock.c cvs rdiff -u -r1.4 -r0 src/sys/arch/sandpoint/include/spr.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/netboot/entry.S 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/macppc/macppc/cpu.c diff -u src/sys/arch/macppc/macppc/cpu.c:1.52 src/sys/arch/macppc/macppc/cpu.c:1.53 --- src/sys/arch/macppc/macppc/cpu.c:1.52 Fri Nov 27 03:23:11 2009 +++ src/sys/arch/macppc/macppc/cpu.c Tue Mar 2 21:52:33 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.52 2009/11/27 03:23:11 rmind Exp $ */ +/* $NetBSD: cpu.c,v 1.53 2010/03/02 21:52:33 matt Exp $ */ /*- * Copyright (c) 2001 Tsubai Masanari. @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.52 2009/11/27 03:23:11 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.53 2010/03/02 21:52:33 matt Exp $"); #include "opt_ppcparam.h" #include "opt_multiprocessor.h" @@ -53,6 +53,7 @@ #include #include #include +#include #ifdef ALTIVEC #include #endif Index: src/sys/arch/mvmeppc/stand/libsa/srt0.S diff -u src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.2 src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.3 --- src/sys/arch/mvmeppc/stand/libsa/srt0.S:1.2 Mon Apr 28 20:23:30 2008 +++ src/sys/arch/mvmeppc/stand/libsa/srt0.S Tue Mar 2 21:52:33 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.2 2008/04/28 20:23:30 martin Exp $ */ +/* $NetBSD: srt0.S,v 1.3 2010/03/02 21:52:33 matt Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -32,6 +32,7 @@ #include #include #include +#include #define STACK_SIZE 8192 Index: src/sys/arch/ofppc/ofppc/cpu.c diff -u src/sys/arch/ofppc/ofppc/cpu.c:1.11 src/sys/arch/ofppc/ofppc/cpu.c:1.12 --- src/sys/arch/ofppc/ofppc/cpu.c:1.11 Mon Apr 28 20:23:31 2008 +++ src/sys/arch/ofppc/ofppc/cpu.c Tue Mar 2 21:52:33 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.11 2008/04/28 20:23:31 martin Exp $ */ +/* $NetBSD: cpu.c,v 1.12 2010/03/02 21:52:33 matt Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.11 2008/04/28 20:23:31 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.12 2010/03/02 21:52:33 matt Exp $"); #include "opt_ppcparam.h" #include "opt_multiprocessor.h" @@ -42,12 +42,15 @@ #include #include + #include -#include -#include + #include #include #include +#include +#include +#include #ifdef ALTIVEC #include #endif Index: src/sys/arch/powerpc/include/Makefile diff -u src/sys/arch/powerpc/include/Makefile:1.34 src/sys/arch/powerpc/include/Makefile:1.35 --- src/sys/arch/powerpc/include/Makefile:1.34 Fri Feb 9 21:55:10 2007 +++ src/sys/arch/powerpc/include/Makefile Tue Mar 2 21:52:32 2010 @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.34 2007/02/09 21:55:10 ad Exp $ +# $NetB
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Tue Mar 2 21:52:33 UTC 2010 Modified Files: src/sys/arch/macppc/macppc: cpu.c src/sys/arch/mvmeppc/stand/libsa: srt0.S src/sys/arch/ofppc/ofppc: cpu.c src/sys/arch/powerpc/include: Makefile src/sys/arch/prep/prep: locore.S src/sys/arch/prep/stand/boot: boot.c clock.c src/sys/arch/rs6000/stand/boot: boot.c clock.c src/sys/arch/sandpoint/stand/netboot: entry.S Removed Files: src/sys/arch/amigappc/include: spr.h src/sys/arch/bebox/include: spr.h src/sys/arch/evbppc/include: spr.h src/sys/arch/ibmnws/include: spr.h src/sys/arch/macppc/include: spr.h src/sys/arch/mvmeppc/include: spr.h src/sys/arch/ofppc/include: spr.h src/sys/arch/prep/include: spr.h src/sys/arch/rs6000/include: spr.h src/sys/arch/sandpoint/include: spr.h Log Message: Add missing to a few files missed on the first pass. Don't export to userland, only To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/arch/amigappc/include/spr.h cvs rdiff -u -r1.4 -r0 src/sys/arch/bebox/include/spr.h cvs rdiff -u -r1.4 -r0 src/sys/arch/evbppc/include/spr.h cvs rdiff -u -r1.2 -r0 src/sys/arch/ibmnws/include/spr.h cvs rdiff -u -r1.4 -r0 src/sys/arch/macppc/include/spr.h cvs rdiff -u -r1.52 -r1.53 src/sys/arch/macppc/macppc/cpu.c cvs rdiff -u -r1.4 -r0 src/sys/arch/mvmeppc/include/spr.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mvmeppc/stand/libsa/srt0.S cvs rdiff -u -r1.4 -r0 src/sys/arch/ofppc/include/spr.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ofppc/ofppc/cpu.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/include/Makefile cvs rdiff -u -r1.4 -r0 src/sys/arch/prep/include/spr.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/prep/prep/locore.S cvs rdiff -u -r1.16 -r1.17 src/sys/arch/prep/stand/boot/boot.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/prep/stand/boot/clock.c cvs rdiff -u -r1.1 -r0 src/sys/arch/rs6000/include/spr.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/stand/boot/boot.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/rs6000/stand/boot/clock.c cvs rdiff -u -r1.4 -r0 src/sys/arch/sandpoint/include/spr.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/stand/netboot/entry.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Tue Mar 2 21:32:29 UTC 2010
Modified Files:
src/sys/dev: vnd.c
src/sys/uvm: uvm_swap.c
Log Message:
For the nfs throttling kludge, test against v_tag == VT_NFS instead
of v_op (the latter imposes linkage).
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/dev/vnd.c
cvs rdiff -u -r1.149 -r1.150 src/sys/uvm/uvm_swap.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/vnd.c
diff -u src/sys/dev/vnd.c:1.207 src/sys/dev/vnd.c:1.208
--- src/sys/dev/vnd.c:1.207 Sun Jan 31 15:40:08 2010
+++ src/sys/dev/vnd.c Tue Mar 2 21:32:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.207 2010/01/31 15:40:08 mlelstv Exp $ */
+/* $NetBSD: vnd.c,v 1.208 2010/03/02 21:32:29 pooka Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -130,10 +130,9 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.207 2010/01/31 15:40:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.208 2010/03/02 21:32:29 pooka Exp $");
#if defined(_KERNEL_OPT)
-#include "fs_nfs.h"
#include "opt_vnd.h"
#endif
@@ -1560,13 +1559,10 @@
static void
vndthrottle(struct vnd_softc *vnd, struct vnode *vp)
{
-#ifdef NFS
- extern int (**nfsv2_vnodeop_p)(void *);
- if (vp->v_op == nfsv2_vnodeop_p)
+ if (vp->v_tag == VT_NFS)
vnd->sc_maxactive = 2;
else
-#endif
vnd->sc_maxactive = 8;
if (vnd->sc_maxactive < 1)
Index: src/sys/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.149 src/sys/uvm/uvm_swap.c:1.150
--- src/sys/uvm/uvm_swap.c:1.149 Sun Feb 7 15:51:28 2010
+++ src/sys/uvm/uvm_swap.c Tue Mar 2 21:32:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.149 2010/02/07 15:51:28 mlelstv Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.150 2010/03/02 21:32:29 pooka Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,9 +30,8 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.149 2010/02/07 15:51:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.150 2010/03/02 21:32:29 pooka Exp $");
-#include "fs_nfs.h"
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -818,9 +817,6 @@
long addr;
u_long result;
struct vattr va;
-#ifdef NFS
- extern int (**nfsv2_vnodeop_p)(void *);
-#endif /* NFS */
const struct bdevsw *bdev;
dev_t dev;
UVMHIST_FUNC("swap_on"); UVMHIST_CALLED(pdhist);
@@ -877,11 +873,9 @@
* limit the max # of outstanding I/O requests we issue
* at any one time. take it easy on NFS servers.
*/
-#ifdef NFS
- if (vp->v_op == nfsv2_vnodeop_p)
+ if (vp->v_tag == VT_NFS)
sdp->swd_maxactive = 2; /* XXX */
else
-#endif /* NFS */
sdp->swd_maxactive = 8; /* XXX */
break;
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Tue Mar 2 21:32:29 UTC 2010 Modified Files: src/sys/dev: vnd.c src/sys/uvm: uvm_swap.c Log Message: For the nfs throttling kludge, test against v_tag == VT_NFS instead of v_op (the latter imposes linkage). To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/sys/dev/vnd.c cvs rdiff -u -r1.149 -r1.150 src/sys/uvm/uvm_swap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: pooka Date: Tue Mar 2 21:17:31 UTC 2010 Modified Files: src/sys/arch/hpcarm/hpcarm: hpc_machdep.c src/sys/arch/hpcmips/hpcmips: machdep.c src/sys/arch/hpcsh/hpcsh: machdep.c Log Message: Remove unnecessary #ifdef NFS. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c cvs rdiff -u -r1.110 -r1.111 src/sys/arch/hpcmips/hpcmips/machdep.c cvs rdiff -u -r1.71 -r1.72 src/sys/arch/hpcsh/hpcsh/machdep.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/hpcarm/hpcarm/hpc_machdep.c diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.95 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.96 --- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.95 Sat Dec 26 16:01:25 2009 +++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c Tue Mar 2 21:17:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: hpc_machdep.c,v 1.95 2009/12/26 16:01:25 uebayasi Exp $ */ +/* $NetBSD: hpc_machdep.c,v 1.96 2010/03/02 21:17:31 pooka Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -40,12 +40,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.95 2009/12/26 16:01:25 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.96 2010/03/02 21:17:31 pooka Exp $"); #include "opt_ddb.h" #include "opt_modular.h" #include "opt_pmap_debug.h" -#include "fs_nfs.h" #include "ksyms.h" #include @@ -91,13 +90,11 @@ #include #include -#ifdef NFS #include #include #include #include #include -#endif /* NFS */ /* Kernel text starts 256K in from the bottom of the kernel address space. */ #define KERNEL_TEXT_BASE (KERNEL_BASE + 0x0004) @@ -360,14 +357,10 @@ case 'b': /* boot device: -b=sd0 etc. */ cp = cp + 2; -#ifdef NFS if (strcmp(cp, MOUNT_NFS) == 0) rootfstype = MOUNT_NFS; else strncpy(boot_file, cp, sizeof(boot_file)); -#else /* !NFS */ - strncpy(boot_file, cp, sizeof(boot_file)); -#endif /* !NFS */ break; default: BOOT_FLAG(*cp, boothowto); Index: src/sys/arch/hpcmips/hpcmips/machdep.c diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.110 src/sys/arch/hpcmips/hpcmips/machdep.c:1.111 --- src/sys/arch/hpcmips/hpcmips/machdep.c:1.110 Tue Mar 2 17:28:08 2010 +++ src/sys/arch/hpcmips/hpcmips/machdep.c Tue Mar 2 21:17:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.110 2010/03/02 17:28:08 pooka Exp $ */ +/* $NetBSD: machdep.c,v 1.111 2010/03/02 21:17:31 pooka Exp $ */ /*- * Copyright (c) 1999 Shin Takemura, All rights reserved. @@ -108,7 +108,7 @@ */ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.110 2010/03/02 17:28:08 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.111 2010/03/02 21:17:31 pooka Exp $"); #include "opt_vr41xx.h" #include "opt_tx39xx.h" @@ -119,7 +119,6 @@ #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_rtc_offset.h" -#include "fs_nfs.h" #include "opt_kloader.h" #include "opt_kloader_kernel_path.h" #include "debug_hpc.h" @@ -179,12 +178,10 @@ #define DPRINTF(arg) #endif /* NBICONSDEV > 0 */ -#ifdef NFS #include #include #include #include -#endif #ifdef MEMORY_DISK_DYNAMIC #include @@ -413,14 +410,10 @@ case 'b': /* boot device: -b=sd0 etc. */ -#ifdef NFS if (strcmp(cp+2, "nfs") == 0) rootfstype = MOUNT_NFS; else makebootdev(cp+2); -#else /* NFS */ -makebootdev(cp+2); -#endif /* NFS */ cp += strlen(cp); break; default: Index: src/sys/arch/hpcsh/hpcsh/machdep.c diff -u src/sys/arch/hpcsh/hpcsh/machdep.c:1.71 src/sys/arch/hpcsh/hpcsh/machdep.c:1.72 --- src/sys/arch/hpcsh/hpcsh/machdep.c:1.71 Tue Mar 2 17:28:08 2010 +++ src/sys/arch/hpcsh/hpcsh/machdep.c Tue Mar 2 21:17:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.71 2010/03/02 17:28:08 pooka Exp $ */ +/* $NetBSD: machdep.c,v 1.72 2010/03/02 21:17:31 pooka Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -27,13 +27,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2010/03/02 17:28:08 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2010/03/02 21:17:31 pooka Exp $"); #include "opt_md.h" #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_modular.h" -#include "fs_nfs.h" #include "biconsdev.h" #include "debug_hpc.h" #include "hd64465if.h" @@ -97,12 +96,10 @@ #include /* makebootdev() */ #include -#ifdef NFS #include #include #include #include -#endif #include @@ -240,14 +237,10 @@ case 'b': /* boot device: -b=sd0 etc. */ p = cp + 2; -#ifdef NFS if (strcmp(p, "nfs") == 0) rootfstype = MOUNT_NFS; else makebootdev(p); -#else /* NFS */ - makebootdev(p); -#endif /* NFS */ break; default: BOOT_FLAG(*cp, boothowto);
CVS commit: src/sys/arch
Module Name:src Committed By: pooka Date: Tue Mar 2 21:17:31 UTC 2010 Modified Files: src/sys/arch/hpcarm/hpcarm: hpc_machdep.c src/sys/arch/hpcmips/hpcmips: machdep.c src/sys/arch/hpcsh/hpcsh: machdep.c Log Message: Remove unnecessary #ifdef NFS. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c cvs rdiff -u -r1.110 -r1.111 src/sys/arch/hpcmips/hpcmips/machdep.c cvs rdiff -u -r1.71 -r1.72 src/sys/arch/hpcsh/hpcsh/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src Committed By: pooka Date: Tue Mar 2 21:14:44 UTC 2010 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c src/sys/compat/darwin: darwin_syscall.h darwin_syscallargs.h darwin_syscalls.c darwin_sysent.c src/sys/compat/freebsd: freebsd_file.c freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h sunos32_syscalls.c sunos32_sysent.c src/sys/compat/ultrix: ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: regen: - remove nfssvc / fs_nfs.h / #ifdef NFS - make getfh unconditional To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.38 -r1.39 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.37 -r1.38 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.42 -r1.43 src/sys/compat/aoutm68k/aoutm68k_sysent.c cvs rdiff -u -r1.58 -r1.59 src/sys/compat/darwin/darwin_syscall.h \ src/sys/compat/darwin/darwin_syscallargs.h cvs rdiff -u -r1.59 -r1.60 src/sys/compat/darwin/darwin_syscalls.c \ src/sys/compat/darwin/darwin_sysent.c cvs rdiff -u -r1.31 -r1.32 src/sys/compat/freebsd/freebsd_file.c cvs rdiff -u -r1.75 -r1.76 src/sys/compat/freebsd/freebsd_syscall.h \ src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.78 -r1.79 src/sys/compat/freebsd/freebsd_syscallargs.h cvs rdiff -u -r1.77 -r1.78 src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.91 -r1.92 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.90 -r1.91 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.26 -r1.27 src/sys/compat/sunos32/sunos32_syscall.h cvs rdiff -u -r1.25 -r1.26 src/sys/compat/sunos32/sunos32_syscallargs.h \ src/sys/compat/sunos32/sunos32_syscalls.c cvs rdiff -u -r1.27 -r1.28 src/sys/compat/sunos32/sunos32_sysent.c cvs rdiff -u -r1.61 -r1.62 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.56 -r1.57 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.60 -r1.61 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.63 -r1.64 src/sys/compat/ultrix/ultrix_sysent.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/compat/aoutm68k/aoutm68k_syscall.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.40 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.41 --- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.40 Tue Mar 2 16:09:10 2010 +++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Tue Mar 2 21:14:43 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscall.h,v 1.40 2010/03/02 16:09:10 pooka Exp $ */ +/* $NetBSD: aoutm68k_syscall.h,v 1.41 2010/03/02 21:14:43 pooka Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.35 2010/03/02 16:08:15 pooka Exp + * created from NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp */ #ifndef _AOUTM68K_SYS_SYSCALL_H_ @@ -562,13 +562,7 @@ /* 149 is excluded compat_43_sys_quota */ /* 150 is excluded compat_43_sys_getsockname */ #endif -#if defined(NFSSERVER) || !defined(_KERNEL) -/* syscall: "nfssvc" ret: "int" args: "int" "void *" */ -#define AOUTM68K_SYS_nfssvc 155 - -#else /* 155 is excluded nfssvc */ -#endif #if defined(COMPAT_43) || !defined(_KERNEL) /* syscall: "ogetdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */ #define AOUTM68K_SYS_ogetdirentries 156 Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.38 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.39 --- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.38 Tue Mar 2 16:09:10 2010 +++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Tue Mar 2 21:14:43 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: aoutm68k_syscallargs.h,v 1.38 2010/03/02 16:09:10 pooka Exp $ */ +/* $NetBSD: aoutm68k_syscallargs.h,v 1.39 2010/03/02 21:14:43 pooka Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.35 2010/03/02 16:08:15 pooka Exp + * created from NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp */ #ifndef _AOUTM68K_SYS_SYSCALLARGS_H_ @@ -364,11 +364,6 @@ struct compat_43_sys_getsockname_args; #else #endif -#if defined(NFSSERVER) || !defined(_KERNEL) - -struct sys_nfssvc_args; -#else -#endif #if defined(COMPAT_43) || !defined(_KERNEL) struct compat_43_sys_getdirentries_args; @@ -1014,11 +1009,6 @
CVS commit: src/sys/compat
Module Name:src Committed By: pooka Date: Tue Mar 2 21:14:44 UTC 2010 Modified Files: src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c src/sys/compat/darwin: darwin_syscall.h darwin_syscallargs.h darwin_syscalls.c darwin_sysent.c src/sys/compat/freebsd: freebsd_file.c freebsd_syscall.h freebsd_syscallargs.h freebsd_syscalls.c freebsd_sysent.c src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c src/sys/compat/sunos32: sunos32_syscall.h sunos32_syscallargs.h sunos32_syscalls.c sunos32_sysent.c src/sys/compat/ultrix: ultrix_syscall.h ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c Log Message: regen: - remove nfssvc / fs_nfs.h / #ifdef NFS - make getfh unconditional To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/compat/aoutm68k/aoutm68k_syscall.h cvs rdiff -u -r1.38 -r1.39 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h cvs rdiff -u -r1.37 -r1.38 src/sys/compat/aoutm68k/aoutm68k_syscalls.c cvs rdiff -u -r1.42 -r1.43 src/sys/compat/aoutm68k/aoutm68k_sysent.c cvs rdiff -u -r1.58 -r1.59 src/sys/compat/darwin/darwin_syscall.h \ src/sys/compat/darwin/darwin_syscallargs.h cvs rdiff -u -r1.59 -r1.60 src/sys/compat/darwin/darwin_syscalls.c \ src/sys/compat/darwin/darwin_sysent.c cvs rdiff -u -r1.31 -r1.32 src/sys/compat/freebsd/freebsd_file.c cvs rdiff -u -r1.75 -r1.76 src/sys/compat/freebsd/freebsd_syscall.h \ src/sys/compat/freebsd/freebsd_syscalls.c cvs rdiff -u -r1.78 -r1.79 src/sys/compat/freebsd/freebsd_syscallargs.h cvs rdiff -u -r1.77 -r1.78 src/sys/compat/freebsd/freebsd_sysent.c cvs rdiff -u -r1.91 -r1.92 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.90 -r1.91 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.26 -r1.27 src/sys/compat/sunos32/sunos32_syscall.h cvs rdiff -u -r1.25 -r1.26 src/sys/compat/sunos32/sunos32_syscallargs.h \ src/sys/compat/sunos32/sunos32_syscalls.c cvs rdiff -u -r1.27 -r1.28 src/sys/compat/sunos32/sunos32_sysent.c cvs rdiff -u -r1.61 -r1.62 src/sys/compat/ultrix/ultrix_syscall.h cvs rdiff -u -r1.56 -r1.57 src/sys/compat/ultrix/ultrix_syscallargs.h cvs rdiff -u -r1.60 -r1.61 src/sys/compat/ultrix/ultrix_syscalls.c cvs rdiff -u -r1.63 -r1.64 src/sys/compat/ultrix/ultrix_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src
Committed By: pooka
Date: Tue Mar 2 21:09:22 UTC 2010
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
src/sys/compat/osf1: osf1_mount.c
src/sys/compat/sunos32: sunos32_misc.c
src/sys/compat/ultrix: ultrix_misc.c
Log Message:
remove nfssvc emulation (or non-emulation)
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.46 -r1.47 src/sys/compat/osf1/osf1_mount.c
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/sunos32/sunos32_misc.c
cvs rdiff -u -r1.118 -r1.119 src/sys/compat/ultrix/ultrix_misc.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/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.165 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.166
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.165 Tue Mar 2 16:08:15 2010
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.165 2010/03/02 16:08:15 pooka Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.166 2010/03/02 21:09:21 pooka Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.165 2010/03/02 16:08:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.166 2010/03/02 21:09:21 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -1204,25 +1204,6 @@
}
int
-netbsd32_nfssvc(struct lwp *l, const struct netbsd32_nfssvc_args *uap, register_t *retval)
-{
-#if 0
- /* {
- syscallarg(int) flag;
- syscallarg(netbsd32_voidp) argp;
- } */
- struct sys_nfssvc_args ua;
-
- NETBSD32TO64_UAP(flag);
- NETBSD32TOP_UAP(argp, void);
- return (sys_nfssvc(l, &ua, retval));
-#else
- /* Why would we want to support a 32-bit nfsd? */
- return (ENOSYS);
-#endif
-}
-
-int
netbsd32___getfh30(struct lwp *l, const struct netbsd32___getfh30_args *uap, register_t *retval)
{
/* {
Index: src/sys/compat/osf1/osf1_mount.c
diff -u src/sys/compat/osf1/osf1_mount.c:1.46 src/sys/compat/osf1/osf1_mount.c:1.47
--- src/sys/compat/osf1/osf1_mount.c:1.46 Mon Jun 29 05:08:16 2009
+++ src/sys/compat/osf1/osf1_mount.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_mount.c,v 1.46 2009/06/29 05:08:16 dholland Exp $ */
+/* $NetBSD: osf1_mount.c,v 1.47 2010/03/02 21:09:21 pooka Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,11 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.46 2009/06/29 05:08:16 dholland Exp $");
-
-#if defined(_KERNEL_OPT)
-#include "fs_nfs.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.47 2010/03/02 21:09:21 pooka Exp $");
#include
#include
Index: src/sys/compat/sunos32/sunos32_misc.c
diff -u src/sys/compat/sunos32/sunos32_misc.c:1.67 src/sys/compat/sunos32/sunos32_misc.c:1.68
--- src/sys/compat/sunos32/sunos32_misc.c:1.67 Mon Jun 29 05:08:16 2009
+++ src/sys/compat/sunos32/sunos32_misc.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_misc.c,v 1.67 2009/06/29 05:08:16 dholland Exp $ */
+/* $NetBSD: sunos32_misc.c,v 1.68 2010/03/02 21:09:21 pooka Exp $ */
/* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */
/*
@@ -77,14 +77,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.67 2009/06/29 05:08:16 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.68 2010/03/02 21:09:21 pooka Exp $");
#define COMPAT_SUNOS 1
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
#include "opt_compat_netbsd.h"
-#include "fs_nfs.h"
#endif
#include
@@ -528,19 +527,6 @@
0, &dummy);
}
-#if defined(NFS)
-int
-async_daemon(struct lwp *l, const void *v, register_t *retval)
-{
- struct netbsd32_nfssvc_args ouap;
-
- SCARG(&ouap, flag) = NFSSVC_BIOD;
- NETBSD32PTR32(SCARG(&ouap, argp), 0);
-
- return (netbsd32_nfssvc(l, &ouap, retval));
-}
-#endif /* NFS */
-
void native_to_sunos_sigset(const sigset_t *, int *);
void sunos_to_native_sigset(const int, sigset_t *);
Index: src/sys/compat/ultrix/ultrix_misc.c
diff -u src/sys/compat/ultrix/ultrix_misc.c:1.118 src/sys/compat/ultrix/ultrix_misc.c:1.119
--- src/sys/compat/ultrix/ultrix_misc.c:1.118 Sat Jan 17 15:48:06 2009
+++ src/sys/compat/ultrix/ultrix_misc.c Tue Mar 2 21:09:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_misc.c,v 1.118 2009/01/17 15:48:06 he Exp $ */
+/* $NetBSD: ultrix_misc.c,v 1.119 2010/03/02 21:09:21 pooka Exp $ */
/*
* Copyright (c) 1995, 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.118 2009/01/17 15:48:06 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.119 2010/03/02 21:09:21 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -91,10 +91,6 @@
* handled h
CVS commit: src/sys/compat
Module Name:src Committed By: pooka Date: Tue Mar 2 21:09:22 UTC 2010 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c src/sys/compat/osf1: osf1_mount.c src/sys/compat/sunos32: sunos32_misc.c src/sys/compat/ultrix: ultrix_misc.c Log Message: remove nfssvc emulation (or non-emulation) To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.46 -r1.47 src/sys/compat/osf1/osf1_mount.c cvs rdiff -u -r1.67 -r1.68 src/sys/compat/sunos32/sunos32_misc.c cvs rdiff -u -r1.118 -r1.119 src/sys/compat/ultrix/ultrix_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external
Module Name:src
Committed By: darran
Date: Tue Mar 2 21:08:36 UTC 2010
Modified Files:
src/external/bsd/libelf/dist: _libelf.h
src/external/cddl/osnet/dist/lib/libdtrace/common: dtrace.h
mkerrtags.sh mknames.sh
src/external/cddl/osnet/sys/sys: sysmacros.h types.h
Log Message:
DTrace: Get DTrace to build on OS X platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libelf/dist/_libelf.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh \
src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/sysmacros.h
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/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/external/bsd/libelf/dist/_libelf.h
diff -u src/external/bsd/libelf/dist/_libelf.h:1.4 src/external/bsd/libelf/dist/_libelf.h:1.5
--- src/external/bsd/libelf/dist/_libelf.h:1.4 Sun Dec 20 23:23:46 2009
+++ src/external/bsd/libelf/dist/_libelf.h Tue Mar 2 21:08:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: _libelf.h,v 1.4 2009/12/20 23:23:46 thorpej Exp $ */
+/* $NetBSD: _libelf.h,v 1.5 2010/03/02 21:08:36 darran Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -37,6 +37,10 @@
#define NULL ((void *) 0)
#endif
+#ifndef roundup2
+#define roundup2(x, m) (((x) + (m) - 1) & ~((m) - 1))
+#endif
+
/*
* Library-private data structures.
*/
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h:1.3 src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h:1.4
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h:1.3 Sun Feb 21 01:46:34 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h Tue Mar 2 21:08:36 2010
@@ -30,7 +30,6 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include
-typedef processorid_t test_processor_id_t;
#include
#include
#include
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.2 src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.3
--- src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.2 Sun Feb 21 00:49:55 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh Tue Mar 2 21:08:36 2010
@@ -26,7 +26,7 @@
#
#ident "%Z%%M% %I% %E% SMI"
-BSDECHO=-e
+BSDECHO=
echo ${BSDECHO} "\
/*\n\
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.2 src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.3
--- src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.2 Sun Feb 21 00:49:55 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh Tue Mar 2 21:08:36 2010
@@ -26,7 +26,7 @@
#
#ident "%Z%%M% %I% %E% SMI"
-BSDECHO=-e
+BSDECHO=
echo ${BSDECHO} "\
/*\n\
@@ -44,7 +44,7 @@
{\n\
switch (subr) {"
-nawk '
+awk '
/^#define[ ]*DIF_SUBR_/ && $2 != "DIF_SUBR_MAX" {
printf("\tcase %s: return (\"%s\");\n", $2, tolower(substr($2, 10)));
}'
Index: src/external/cddl/osnet/sys/sys/sysmacros.h
diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.3 src/external/cddl/osnet/sys/sys/sysmacros.h:1.4
--- src/external/cddl/osnet/sys/sys/sysmacros.h:1.3 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/sys/sys/sysmacros.h Tue Mar 2 21:08:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmacros.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */
+/* $NetBSD: sysmacros.h,v 1.4 2010/03/02 21:08:36 darran Exp $ */
/*
* CDDL HEADER START
@@ -44,7 +44,9 @@
/*
* Disk blocks (sectors) and bytes.
*/
+#ifndef dtob
#define dtob(DD) ((DD) << DEV_BSHIFT)
+#endif
#define btod(BB) (((BB) + DEV_BSIZE - 1) >> DEV_BSHIFT)
#define btodt(BB) ((BB) >> DEV_BSHIFT)
#define lbtod(BB) (((offset_t)(BB) + DEV_BSIZE - 1) >> DEV_BSHIFT)
@@ -140,16 +142,18 @@
/* major part of a device external from the kernel (same as emajor below) */
+#undef major
#define major(x) (major_t)unsigned)(x)) >> O_BITSMINOR) & O_MAXMAJ)
/* minor part of a device external from the kernel (same as eminor below) */
-
+#undef minor
#define minor(x) (minor_t)((x) & O_MAXMIN)
#endif /* _KERNEL */
/* create old device number */
+#undef makedev
#define makedev(x, y) (unsigned short)(((x) << O_BITSMINOR) | ((y) & O_MAXMIN))
/* make an new device number */
@@ -224,6 +228,7 @@
/*
* Macros for counting and rounding.
*/
+#undef howmany
#define howmany(x, y) (((x)+((y)-1))/(y))
#define roundup(x, y) x)+((y)-1))/(y))*(y))
@@ -342,7 +347,7 @@
* because if a field crosses a byte boundary it's not likely to be meaningful
* without reassembly in its nonnative endianness.
*/
-#ifn
CVS commit: src/external
Module Name:src Committed By: darran Date: Tue Mar 2 21:08:36 UTC 2010 Modified Files: src/external/bsd/libelf/dist: _libelf.h src/external/cddl/osnet/dist/lib/libdtrace/common: dtrace.h mkerrtags.sh mknames.sh src/external/cddl/osnet/sys/sys: sysmacros.h types.h Log Message: DTrace: Get DTrace to build on OS X platforms. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libelf/dist/_libelf.h cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh \ src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/sysmacros.h cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src Committed By: pooka Date: Tue Mar 2 21:07:22 UTC 2010 Modified Files: src/sys/compat/aoutm68k: syscalls.master src/sys/compat/darwin: syscalls.master src/sys/compat/freebsd: syscalls.master src/sys/compat/netbsd32: syscalls.master src/sys/compat/sunos32: syscalls.master src/sys/compat/ultrix: syscalls.master Log Message: Kill fs_nfs.h and #ifdef NFS by making getfh() support unconditional and nfssvc unsupport unconditional. nfs server was just a fancy NOP anyway for all except Ultrix. I know I'm boring but I couldn't imagine why someone would want to run an Ultrix nfs server (and I also doubt that it would work anymore with all the changes to fs exporting etc). To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/compat/aoutm68k/syscalls.master cvs rdiff -u -r1.39 -r1.40 src/sys/compat/darwin/syscalls.master cvs rdiff -u -r1.63 -r1.64 src/sys/compat/freebsd/syscalls.master cvs rdiff -u -r1.83 -r1.84 src/sys/compat/netbsd32/syscalls.master cvs rdiff -u -r1.20 -r1.21 src/sys/compat/sunos32/syscalls.master cvs rdiff -u -r1.50 -r1.51 src/sys/compat/ultrix/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src
Committed By: pooka
Date: Tue Mar 2 21:07:22 UTC 2010
Modified Files:
src/sys/compat/aoutm68k: syscalls.master
src/sys/compat/darwin: syscalls.master
src/sys/compat/freebsd: syscalls.master
src/sys/compat/netbsd32: syscalls.master
src/sys/compat/sunos32: syscalls.master
src/sys/compat/ultrix: syscalls.master
Log Message:
Kill fs_nfs.h and #ifdef NFS by making getfh() support unconditional
and nfssvc unsupport unconditional. nfs server was just a fancy
NOP anyway for all except Ultrix. I know I'm boring but I couldn't
imagine why someone would want to run an Ultrix nfs server (and I
also doubt that it would work anymore with all the changes to fs
exporting etc).
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/aoutm68k/syscalls.master
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/darwin/syscalls.master
cvs rdiff -u -r1.63 -r1.64 src/sys/compat/freebsd/syscalls.master
cvs rdiff -u -r1.83 -r1.84 src/sys/compat/netbsd32/syscalls.master
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/sunos32/syscalls.master
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/ultrix/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/aoutm68k/syscalls.master
diff -u src/sys/compat/aoutm68k/syscalls.master:1.35 src/sys/compat/aoutm68k/syscalls.master:1.36
--- src/sys/compat/aoutm68k/syscalls.master:1.35 Tue Mar 2 16:08:15 2010
+++ src/sys/compat/aoutm68k/syscalls.master Tue Mar 2 21:07:21 2010
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.35 2010/03/02 16:08:15 pooka Exp $
+ $NetBSD: syscalls.master,v 1.36 2010/03/02 21:07:21 pooka Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -41,8 +41,6 @@
#include "opt_compat_netbsd.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
-
-#include "fs_nfs.h"
#endif
#include
@@ -423,11 +421,7 @@
152 UNIMPL
153 UNIMPL
154 UNIMPL
-#if defined(NFSSERVER) || !defined(_KERNEL)
-155 NOARGS { int|sys||nfssvc(int flag, void *argp); }
-#else
155 EXCL nfssvc
-#endif
#if defined(COMPAT_43) || !defined(_KERNEL)
156 NOARGS { int|compat_43_sys||getdirentries(int fd, char *buf, \
u_int count, long *basep); } ogetdirentries
Index: src/sys/compat/darwin/syscalls.master
diff -u src/sys/compat/darwin/syscalls.master:1.39 src/sys/compat/darwin/syscalls.master:1.40
--- src/sys/compat/darwin/syscalls.master:1.39 Tue Mar 2 16:00:03 2010
+++ src/sys/compat/darwin/syscalls.master Tue Mar 2 21:07:21 2010
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.39 2010/03/02 16:00:03 pooka Exp $
+ $NetBSD: syscalls.master,v 1.40 2010/03/02 21:07:21 pooka Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -41,8 +41,6 @@
#include "opt_sysv.h"
#include "opt_compat_43.h"
-#include "fs_nfs.h"
-
#include
#include
#include
@@ -317,11 +315,7 @@
152 UNIMPL setprivexec
153 UNIMPL pread
154 UNIMPL pwrite
-#if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
-155 NOARGS { int|sys||nfssvc(int flag, void *argp); }
-#else
155 EXCL nfssvc
-#endif
156 NOARGS { int|compat_43_sys||getdirentries(int fd, char *buf, \
u_int count, long *basep); } ogetdirentries
157 STD { int|darwin_sys||statfs(const char *path, \
Index: src/sys/compat/freebsd/syscalls.master
diff -u src/sys/compat/freebsd/syscalls.master:1.63 src/sys/compat/freebsd/syscalls.master:1.64
--- src/sys/compat/freebsd/syscalls.master:1.63 Tue Mar 2 16:00:03 2010
+++ src/sys/compat/freebsd/syscalls.master Tue Mar 2 21:07:21 2010
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.63 2010/03/02 16:00:03 pooka Exp $
+ $NetBSD: syscalls.master,v 1.64 2010/03/02 21:07:21 pooka Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -301,12 +301,8 @@
struct statfs12 *buf); }
159 UNIMPL
160 UNIMPL
-#ifdef NFS
161 NOARGS { int|compat_30_sys||getfh(const char *fname, \
struct compat_30_fhandle *fhp); }
-#else
-161 UNIMPL getfh
-#endif
162 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
int len); }
163 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.83 src/sys/compat/netbsd32/syscalls.master:1.84
--- src/sys/compat/netbsd32/syscalls.master:1.83 Tue Mar 2 16:02:43 2010
+++ src/sys/compat/netbsd32/syscalls.master Tue Mar 2 21:07:21 2010
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.83 2010/03/02 16:02:43 pooka Exp $
+ $NetBSD: syscalls.master,v 1.84 2010/03/02 21:07:21 pooka Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -42,8 +42,6 @@
#include "opt_sysv.h"
#include "opt_compat_43.h"
#include "opt_posix.h"
-
-#include "fs_nfs.h"
#endif
#include
@@ -320,7 +318,7 @@
152 UNIMPL
153 UNIMPL
154 UNIMPL
-155 STD { int|netbsd32||nfssvc(int flag, netbsd32_v
CVS commit: src/share/man/man4
Module Name:src Committed By: skrll Date: Tue Mar 2 20:49:20 UTC 2010 Modified Files: src/share/man/man4: ddb.4 Log Message: Document new hp700 'frame' command. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: skrll Date: Tue Mar 2 20:49:20 UTC 2010 Modified Files: src/share/man/man4: ddb.4 Log Message: Document new hp700 'frame' command. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ddb.4 diff -u src/share/man/man4/ddb.4:1.136 src/share/man/man4/ddb.4:1.137 --- src/share/man/man4/ddb.4:1.136 Thu Feb 25 17:15:55 2010 +++ src/share/man/man4/ddb.4 Tue Mar 2 20:49:20 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: ddb.4,v 1.136 2010/02/25 17:15:55 wiz Exp $ +.\" $NetBSD: ddb.4,v 1.137 2010/03/02 20:49:20 skrll Exp $ .\" .\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -56,7 +56,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd January 31, 2010 +.Dd March 2, 2010 .Dt DDB 4 .Os .Sh NAME @@ -933,6 +933,14 @@ .It Ic frame Given a trap frame address, print out the trap frame. .El +.Ss HP700 +.Bl -tag -width "traptrace" -compact +.It Ic frame +Without an address the default trap frame is printed. +Otherwise, the trap frame address can be given, or, when the +.Dq l +modifier is used, an LWP address. +.El .Ss MIPS .Bl -tag -width "traptrace" -compact .It Ic cp0
CVS commit: src/share/mk
Module Name:src
Committed By: darran
Date: Tue Mar 2 20:49:18 UTC 2010
Modified Files:
src/share/mk: bsd.lib.mk bsd.own.mk bsd.prog.mk bsd.sys.mk sys.mk
Log Message:
DTrace: Add CTF generation to the make framework. Only enabled when
MKDTRACE=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.619 -r1.620 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.246 -r1.247 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.189 -r1.190 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.99 -r1.100 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.304 src/share/mk/bsd.lib.mk:1.305
--- src/share/mk/bsd.lib.mk:1.304 Mon Feb 22 12:33:22 2010
+++ src/share/mk/bsd.lib.mk Tue Mar 2 20:49:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.304 2010/02/22 12:33:22 njoly Exp $
+# $NetBSD: bsd.lib.mk,v 1.305 2010/03/02 20:49:18 darran Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -216,9 +216,18 @@
AFLAGS+= ${COPTS}
FFLAGS+= ${FOPTS}
+.if defined(CTFCONVERT)
+.if defined(CFLAGS) && !empty(CFLAGS:M*-g*)
+CTFFLAGS+= -g
+.endif
+.endif
+
.c.o:
${_MKTARGET_COMPILE}
${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET}
.endif
@@ -226,6 +235,9 @@
.c.po:
${_MKTARGET_COMPILE}
${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
${OBJCOPY} -X ${.TARGET}
.endif
@@ -269,6 +281,9 @@
.f.o:
${_MKTARGET_COMPILE}
${COMPILE.f} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.if !defined(FOPTS) || empty(FOPTS:M*-g*)
${OBJCOPY} -x ${.TARGET}
.endif
@@ -276,6 +291,9 @@
.f.po:
${_MKTARGET_COMPILE}
${COMPILE.f} ${PROFFLAGS} -pg ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.if !defined(FOPTS) || empty(FOPTS:M*-g*)
${OBJCOPY} -X ${.TARGET}
.endif
@@ -298,6 +316,9 @@
.m.o:
${_MKTARGET_COMPILE}
${COMPILE.m} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
${OBJCOPY} -x ${.TARGET}
.endif
@@ -305,6 +326,9 @@
.m.po:
${_MKTARGET_COMPILE}
${COMPILE.m} ${PROFFLAGS} -pg ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
${OBJCOPY} -X ${.TARGET}
.endif
@@ -326,21 +350,33 @@
.s.o:
${_MKTARGET_COMPILE}
${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
${OBJCOPY} -x ${.TARGET}
.S.o:
${_MKTARGET_COMPILE}
${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
${OBJCOPY} -x ${.TARGET}
.s.po:
${_MKTARGET_COMPILE}
${COMPILE.s} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
${OBJCOPY} -X ${.TARGET}
.S.po:
${_MKTARGET_COMPILE}
${COMPILE.S} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
${OBJCOPY} -X ${.TARGET}
.s.go:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.619 src/share/mk/bsd.own.mk:1.620
--- src/share/mk/bsd.own.mk:1.619 Sat Feb 27 22:42:54 2010
+++ src/share/mk/bsd.own.mk Tue Mar 2 20:49:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.619 2010/02/27 22:42:54 haad Exp $
+# $NetBSD: bsd.own.mk,v 1.620 2010/03/02 20:49:18 darran Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -236,6 +236,8 @@
TOOL_CONFIG= ${TOOLDIR}/bin/${_TOOL_PREFIX}config
TOOL_CRUNCHGEN= MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
TOOL_CTAGS= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctags
+TOOL_CTFCONVERT= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
+TOOL_CTFMERGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
TOOL_DB= ${TOOLDIR}/bin/${_TOOL_PREFIX}db
TOOL_DISKLABEL= ${TOOLDIR}/bin/nbdisklabel-${MAKEWRAPPERMACHINE}
TOOL_EQN= ${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
@@ -311,6 +313,8 @@
TOOL_CONFIG= config
TOOL_CRUNCHGEN= crunchgen
TOOL_CTAGS= ctags
+TOOL_CTFCONVERT= c
CVS commit: src/share/mk
Module Name:src Committed By: darran Date: Tue Mar 2 20:49:18 UTC 2010 Modified Files: src/share/mk: bsd.lib.mk bsd.own.mk bsd.prog.mk bsd.sys.mk sys.mk Log Message: DTrace: Add CTF generation to the make framework. Only enabled when MKDTRACE=yes. To generate a diff of this commit: cvs rdiff -u -r1.304 -r1.305 src/share/mk/bsd.lib.mk cvs rdiff -u -r1.619 -r1.620 src/share/mk/bsd.own.mk cvs rdiff -u -r1.246 -r1.247 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.189 -r1.190 src/share/mk/bsd.sys.mk cvs rdiff -u -r1.99 -r1.100 src/share/mk/sys.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src
Committed By: darran
Date: Tue Mar 2 20:47:01 UTC 2010
Modified Files:
src/tools: Makefile
Log Message:
DTrace: add libelf, libdwarf, libctf, and CTF tools to the toolchain,
built when MKDTRACE=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.136 src/tools/Makefile:1.137
--- src/tools/Makefile:1.136 Sat Feb 20 00:35:11 2010
+++ src/tools/Makefile Tue Mar 2 20:47:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2010/02/20 00:35:11 joerg Exp $
+# $NetBSD: Makefile,v 1.137 2010/03/02 20:47:01 darran Exp $
.include
@@ -27,6 +27,14 @@
TOOLCHAIN_BITS+= .WAIT dbsym mdsetimage
.endif
+DTRACE_BITS=
+.if ${MKDTRACE} != "no"
+DTRACE_BITS+= .WAIT libelf
+DTRACE_BITS+= .WAIT libdwarf
+DTRACE_BITS+= .WAIT libctf
+DTRACE_BITS+= .WAIT ctfconvert ctfmerge
+.endif
+
LINT_BITS=
.if ${MKLINT} != "no"
LINT_BITS= lint lint2
@@ -45,6 +53,7 @@
.WAIT lex \
.WAIT pax \
.WAIT ${TOOLCHAIN_BITS} \
+ ${DTRACE_BITS} \
asn1_compile atf-compile cat cksum compile_et config db \
file lint1 \
makefs menuc mkcsmapper mkesdb mklocale mknod msgc \
CVS commit: src/tools
Module Name:src Committed By: darran Date: Tue Mar 2 20:47:01 UTC 2010 Modified Files: src/tools: Makefile Log Message: DTrace: add libelf, libdwarf, libctf, and CTF tools to the toolchain, built when MKDTRACE=yes. To generate a diff of this commit: cvs rdiff -u -r1.136 -r1.137 src/tools/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa
Module Name:src
Committed By: skrll
Date: Tue Mar 2 20:40:16 UTC 2010
Modified Files:
src/sys/arch/hppa/conf: files.hppa
src/sys/arch/hppa/include: db_machdep.h
Added Files:
src/sys/arch/hppa/hppa: db_machdep.c
Log Message:
Add a "mach frame" command to hppa ddb.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/conf/files.hppa
cvs rdiff -u -r0 -r1.1 src/sys/arch/hppa/hppa/db_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/include/db_machdep.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/hppa/conf/files.hppa
diff -u src/sys/arch/hppa/conf/files.hppa:1.15 src/sys/arch/hppa/conf/files.hppa:1.16
--- src/sys/arch/hppa/conf/files.hppa:1.15 Wed Nov 19 18:35:58 2008
+++ src/sys/arch/hppa/conf/files.hppa Tue Mar 2 20:40:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.hppa,v 1.15 2008/11/19 18:35:58 ad Exp $
+# $NetBSD: files.hppa,v 1.16 2010/03/02 20:40:15 skrll Exp $
#
# $OpenBSD: files.hppa,v 1.31 2001/06/26 02:41:25 mickey Exp $
#
@@ -14,6 +14,7 @@
file arch/hppa/hppa/db_disasm.c ddb
file arch/hppa/hppa/db_memrw.c ddb | kgdb
file arch/hppa/hppa/db_trace.c ddb
+file arch/hppa/hppa/db_machdep.c ddb
file arch/hppa/hppa/fpu.c
file arch/hppa/hppa/kgdb_hppa.c kgdb
file arch/hppa/hppa/kobj_machdep.c modular
Index: src/sys/arch/hppa/include/db_machdep.h
diff -u src/sys/arch/hppa/include/db_machdep.h:1.8 src/sys/arch/hppa/include/db_machdep.h:1.9
--- src/sys/arch/hppa/include/db_machdep.h:1.8 Tue Nov 3 05:07:26 2009
+++ src/sys/arch/hppa/include/db_machdep.h Tue Mar 2 20:40:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.8 2009/11/03 05:07:26 snj Exp $ */
+/* $NetBSD: db_machdep.h,v 1.9 2010/03/02 20:40:16 skrll Exp $ */
/* $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $ */
@@ -44,6 +44,9 @@
extern db_regs_t ddb_regs;
#define DDB_REGS (&ddb_regs)
+/* DDB commands not in db_interface.c */
+void db_dump_trap(db_expr_t, bool, db_expr_t, const char *);
+
/*
* Things needed by kgdb:
*/
@@ -112,6 +115,8 @@
#define db_clear_single_step(r) ((r)->tf_ipsw &= ~PSW_R)
#define db_set_single_step(r) ((r)->tf_ipsw |= PSW_R)
+#define DB_MACHINE_COMMANDS
+
int db_valid_breakpoint(db_addr_t);
int kdb_trap(int, int, db_regs_t *);
Added files:
Index: src/sys/arch/hppa/hppa/db_machdep.c
diff -u /dev/null src/sys/arch/hppa/hppa/db_machdep.c:1.1
--- /dev/null Tue Mar 2 20:40:16 2010
+++ src/sys/arch/hppa/hppa/db_machdep.c Tue Mar 2 20:40:15 2010
@@ -0,0 +1,126 @@
+/* $NetBSD: db_machdep.c,v 1.1 2010/03/02 20:40:15 skrll Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.1 2010/03/02 20:40:15 skrll Exp $");
+
+#include
+#include
+
+#include
+#include
+
+const struct db_command db_machine_command_table[] = {
+ { DDB_ADD_CMD("frame", db_dump_trap, 0,
+ "Displays the contents of a trapframe",
+ "[/u] [addr]",
+ " addr:\tdisplay this trap frame (current kernel frame otherwise)\n"
+ " /u:\tdisplay the current userland trap frame") },
+ { DDB_ADD_CMD(NULL, NULL, 0, NULL, NULL, NULL) }
+};
+
+void
+db_dump_trap(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+{
+ struct trapframe *tf;
+ const char *cp = modif;
+ bool lwpaddr = false;
+ char c;
+
+ tf = DDB_REGS;
+ while ((c = *cp++) != 0) {
+ if (c == 'l')
+ lwpaddr = true;
+ }
+
+ /* Or an arbitrary trapframe */
+ if
CVS commit: src/sys/arch/hppa
Module Name:src Committed By: skrll Date: Tue Mar 2 20:40:16 UTC 2010 Modified Files: src/sys/arch/hppa/conf: files.hppa src/sys/arch/hppa/include: db_machdep.h Added Files: src/sys/arch/hppa/hppa: db_machdep.c Log Message: Add a "mach frame" command to hppa ddb. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/conf/files.hppa cvs rdiff -u -r0 -r1.1 src/sys/arch/hppa/hppa/db_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/include/db_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/cardbus
Module Name:src
Committed By: dyoung
Date: Tue Mar 2 20:31:14 UTC 2010
Modified Files:
src/sys/dev/cardbus: if_ath_cardbus.c if_atw_cardbus.c
Log Message:
Simplify interrupt (dis)establishment by two source transformations:
- cardbus_intr_disestablish(cc, cf, ih);
+ Cardbus_intr_disestablish(ct, ih);
- ih = cardbus_intr_establish(cc, cf, ...);
+ ih = Cardbus_intr_establish(ct, ...);
Tested with ath & atw units on a Soekris net4521.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/if_atw_cardbus.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/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.40 src/sys/dev/cardbus/if_ath_cardbus.c:1.41
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.40 Thu Feb 25 23:40:39 2010
+++ src/sys/dev/cardbus/if_ath_cardbus.c Tue Mar 2 20:31:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.40 2010/02/25 23:40:39 dyoung Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.41 2010/03/02 20:31:14 dyoung Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA .
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.40 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.41 2010/03/02 20:31:14 dyoung Exp $");
#include "opt_inet.h"
@@ -115,8 +115,7 @@
ath_suspend(&csc->sc_ath);
if (csc->sc_ih != NULL) {
- cardbus_intr_disestablish(csc->sc_ct->ct_cc, csc->sc_ct->ct_cf,
- csc->sc_ih);
+ Cardbus_intr_disestablish(csc->sc_ct, csc->sc_ih);
csc->sc_ih = NULL;
}
return true;
@@ -127,8 +126,8 @@
{
struct ath_cardbus_softc *csc = device_private(self);
- csc->sc_ih = cardbus_intr_establish(csc->sc_ct->ct_cc,
- csc->sc_ct->ct_cf, csc->sc_intrline, IPL_NET, ath_intr,
+ csc->sc_ih = Cardbus_intr_establish(csc->sc_ct,
+ csc->sc_intrline, IPL_NET, ath_intr,
&csc->sc_ath);
if (csc->sc_ih == NULL) {
@@ -235,7 +234,7 @@
* Unhook the interrupt handler.
*/
if (csc->sc_ih != NULL) {
- cardbus_intr_disestablish(ct->ct_cc, ct->ct_cf, csc->sc_ih);
+ Cardbus_intr_disestablish(ct, csc->sc_ih);
csc->sc_ih = NULL;
}
Index: src/sys/dev/cardbus/if_atw_cardbus.c
diff -u src/sys/dev/cardbus/if_atw_cardbus.c:1.32 src/sys/dev/cardbus/if_atw_cardbus.c:1.33
--- src/sys/dev/cardbus/if_atw_cardbus.c:1.32 Thu Feb 25 23:40:39 2010
+++ src/sys/dev/cardbus/if_atw_cardbus.c Tue Mar 2 20:31:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.32 2010/02/25 23:40:39 dyoung Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.33 2010/03/02 20:31:14 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.32 2010/02/25 23:40:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.33 2010/03/02 20:31:14 dyoung Exp $");
#include "opt_inet.h"
@@ -308,7 +308,7 @@
* Unhook the interrupt handler.
*/
if (csc->sc_ih != NULL)
- cardbus_intr_disestablish(ct->ct_cc, ct->ct_cf, csc->sc_ih);
+ Cardbus_intr_disestablish(ct, csc->sc_ih);
/*
* Release bus space and close window.
@@ -326,13 +326,11 @@
struct atw_cardbus_softc *csc = device_private(self);
struct atw_softc *sc = &csc->sc_atw;
cardbus_devfunc_t ct = csc->sc_ct;
- cardbus_chipset_tag_t cc = ct->ct_cc;
- cardbus_function_tag_t cf = ct->ct_cf;
/*
* Map and establish the interrupt.
*/
- csc->sc_ih = cardbus_intr_establish(cc, cf, csc->sc_intrline, IPL_NET,
+ csc->sc_ih = Cardbus_intr_establish(ct, csc->sc_intrline, IPL_NET,
atw_intr, sc);
if (csc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
@@ -347,11 +345,9 @@
{
struct atw_cardbus_softc *csc = device_private(self);
cardbus_devfunc_t ct = csc->sc_ct;
- cardbus_chipset_tag_t cc = ct->ct_cc;
- cardbus_function_tag_t cf = ct->ct_cf;
/* Unhook the interrupt handler. */
- cardbus_intr_disestablish(cc, cf, csc->sc_ih);
+ Cardbus_intr_disestablish(ct, csc->sc_ih);
csc->sc_ih = NULL;
return atw_suspend(self, qual);
CVS commit: src/sys/dev/cardbus
Module Name:src Committed By: dyoung Date: Tue Mar 2 20:31:14 UTC 2010 Modified Files: src/sys/dev/cardbus: if_ath_cardbus.c if_atw_cardbus.c Log Message: Simplify interrupt (dis)establishment by two source transformations: - cardbus_intr_disestablish(cc, cf, ih); + Cardbus_intr_disestablish(ct, ih); - ih = cardbus_intr_establish(cc, cf, ...); + ih = Cardbus_intr_establish(ct, ...); Tested with ath & atw units on a Soekris net4521. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/dev/cardbus/if_ath_cardbus.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/if_atw_cardbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: darran Date: Tue Mar 2 20:04:17 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: DTrace: Add the sdt.h header to the set lists. To generate a diff of this commit: cvs rdiff -u -r1.1400 -r1.1401 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: darran Date: Tue Mar 2 20:04:17 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: DTrace: Add the sdt.h header to the set lists. To generate a diff of this commit: cvs rdiff -u -r1.1400 -r1.1401 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1400 src/distrib/sets/lists/comp/mi:1.1401 --- src/distrib/sets/lists/comp/mi:1.1400 Mon Mar 1 19:12:49 2010 +++ src/distrib/sets/lists/comp/mi Tue Mar 2 20:04:16 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1400 2010/03/01 19:12:49 jruoho Exp $ +# $NetBSD: mi,v 1.1401 2010/03/02 20:04:16 darran Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2084,6 +2084,7 @@ ./usr/include/sys/scanio.h comp-c-include ./usr/include/sys/sched.h comp-c-include ./usr/include/sys/scsiio.h comp-c-include +./usr/include/sys/sdt.hcomp-c-include ./usr/include/sys/select.h comp-c-include ./usr/include/sys/selinfo.h comp-c-include ./usr/include/sys/sem.hcomp-c-include
CVS commit: src/sys/ufs
Module Name:src Committed By: pooka Date: Tue Mar 2 19:59:09 UTC 2010 Modified Files: src/sys/ufs: files.ufs Log Message: fs_lfs.h is no longer necessary To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/files.ufs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs
Module Name:src Committed By: pooka Date: Tue Mar 2 19:59:09 UTC 2010 Modified Files: src/sys/ufs: files.ufs Log Message: fs_lfs.h is no longer necessary To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/files.ufs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/files.ufs diff -u src/sys/ufs/files.ufs:1.23 src/sys/ufs/files.ufs:1.24 --- src/sys/ufs/files.ufs:1.23 Tue Mar 2 17:28:09 2010 +++ src/sys/ufs/files.ufs Tue Mar 2 19:59:09 2010 @@ -1,9 +1,9 @@ -# $NetBSD: files.ufs,v 1.23 2010/03/02 17:28:09 pooka Exp $ +# $NetBSD: files.ufs,v 1.24 2010/03/02 19:59:09 pooka Exp $ deffs FFS deffs EXT2FS deffs MFS -deffs fs_lfs.h LFS # XXX +deffs LFS defflag opt_ffs.h FFS_EI FFS_NO_SNAPSHOT APPLE_UFS UFS_DIRHASH
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Tue Mar 2 19:37:03 UTC 2010
Modified Files:
src/sys/kern: init_sysent.c syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen: lfs megamaid syscalls -> MODULAR
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.235 -r1.236 src/sys/kern/syscalls.c
cvs rdiff -u -r1.231 -r1.232 src/sys/sys/syscall.h
cvs rdiff -u -r1.213 -r1.214 src/sys/sys/syscallargs.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/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.244 src/sys/kern/init_sysent.c:1.245
--- src/sys/kern/init_sysent.c:1.244 Tue Jan 5 15:25:33 2010
+++ src/sys/kern/init_sysent.c Tue Mar 2 19:37:02 2010
@@ -1,19 +1,18 @@
-/* $NetBSD: init_sysent.c,v 1.244 2010/01/05 15:25:33 skrll Exp $ */
+/* $NetBSD: init_sysent.c,v 1.245 2010/03/02 19:37:02 pooka Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.244 2010/01/05 15:25:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.245 2010/03/02 19:37:02 pooka Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
-#include "fs_lfs.h"
#include
#include
#include
@@ -492,25 +491,14 @@
(sy_call_t *)sys_setegid }, /* 182 = setegid */
{ ns(struct sys_seteuid_args), 0,
(sy_call_t *)sys_seteuid }, /* 183 = seteuid */
-#if defined(LFS) || !defined(_KERNEL)
{ ns(struct sys_lfs_bmapv_args), 0,
- (sy_call_t *)sys_lfs_bmapv }, /* 184 = lfs_bmapv */
+ (sy_call_t *)sys_nomodule }, /* 184 = lfs_bmapv */
{ ns(struct sys_lfs_markv_args), 0,
- (sy_call_t *)sys_lfs_markv }, /* 185 = lfs_markv */
+ (sy_call_t *)sys_nomodule }, /* 185 = lfs_markv */
{ ns(struct sys_lfs_segclean_args), 0,
- (sy_call_t *)sys_lfs_segclean }, /* 186 = lfs_segclean */
+ (sy_call_t *)sys_nomodule }, /* 186 = lfs_segclean */
{ ns(struct compat_50_sys_lfs_segwait_args), 0,
(sy_call_t *)sys_nomodule }, /* 187 = compat_50_lfs_segwait */
-#else
- { 0, 0, 0,
- sys_nosys }, /* 184 = excluded lfs_bmapv */
- { 0, 0, 0,
- sys_nosys }, /* 185 = excluded lfs_markv */
- { 0, 0, 0,
- sys_nosys }, /* 186 = excluded lfs_segclean */
- { 0, 0, 0,
- sys_nosys }, /* 187 = excluded lfs_segwait */
-#endif
{ ns(struct compat_12_sys_stat_args), 0,
(sy_call_t *)sys_nomodule }, /* 188 = compat_12_stat12 */
{ ns(struct compat_12_sys_fstat_args), 0,
@@ -1027,13 +1015,8 @@
(sy_call_t *)sys___utimes50 }, /* 420 = __utimes50 */
{ ns(struct sys___adjtime50_args), 0,
(sy_call_t *)sys___adjtime50 }, /* 421 = __adjtime50 */
-#if defined(LFS) || !defined(_KERNEL)
{ ns(struct sys___lfs_segwait50_args), 0,
- (sy_call_t *)sys___lfs_segwait50 }, /* 422 = __lfs_segwait50 */
-#else
- { 0, 0, 0,
- sys_nosys }, /* 422 = excluded __lfs_segwait50 */
-#endif
+ (sy_call_t *)sys_nomodule }, /* 422 = __lfs_segwait50 */
{ ns(struct sys___futimes50_args), 0,
(sy_call_t *)sys___futimes50 }, /* 423 = __futimes50 */
{ ns(struct sys___lutimes50_args), 0,
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.235 src/sys/kern/syscalls.c:1.236
--- src/sys/kern/syscalls.c:1.235 Tue Jan 5 15:25:33 2010
+++ src/sys/kern/syscalls.c Tue Mar 2 19:37:02 2010
@@ -1,20 +1,19 @@
-/* $NetBSD: syscalls.c,v 1.235 2010/01/05 15:25:33 skrll Exp $ */
+/* $NetBSD: syscalls.c,v 1.236 2010/03/02 19:37:02 pooka Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.235 2010/01/05 15:25:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.236 2010/03/02 19:37:02 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
-#include "fs_lfs.h"
#include
#include
#include
@@ -224,17 +223,10 @@
/* 181 */ "setgid",
/* 182 */ "setegid",
/* 183 */ "seteuid",
-#if defined(LFS) || !defined(_KERNEL)
/* 184 */ "lfs_bmapv",
/* 185 */ "lfs_markv",
/* 186 */ "lfs_segclean",
/* 187 */ "compat_50_lfs_segwait",
-#else
- /* 184 */ "#184 (excluded lfs_bmapv)",
- /* 185 */ "#185 (excluded lfs_markv)",
- /* 186 */ "#186 (excluded lfs_segclean)",
- /* 187 */ "#187 (excluded lfs_segwait)",
-#endif
/* 188 */ "compat_12_stat12",
/* 189 */ "compat_12_fstat12",
/* 190 */ "compat_12_lstat12",
@@ -502,11 +494,7 @@
/* 419 */ "__settimeofday50",
/* 420 */ "__utimes50",
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Tue Mar 2 19:37:03 UTC 2010 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen: lfs megamaid syscalls -> MODULAR To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/sys/kern/init_sysent.c cvs rdiff -u -r1.235 -r1.236 src/sys/kern/syscalls.c cvs rdiff -u -r1.231 -r1.232 src/sys/sys/syscall.h cvs rdiff -u -r1.213 -r1.214 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: pooka
Date: Tue Mar 2 19:34:49 UTC 2010
Modified Files:
src/sys/ufs/lfs: lfs_vfsops.c
Log Message:
load lfs syscalls in modload
To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/sys/ufs/lfs/lfs_vfsops.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/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.285 src/sys/ufs/lfs/lfs_vfsops.c:1.286
--- src/sys/ufs/lfs/lfs_vfsops.c:1.285 Tue Mar 2 19:30:34 2010
+++ src/sys/ufs/lfs/lfs_vfsops.c Tue Mar 2 19:34:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.285 2010/03/02 19:30:34 pooka Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.286 2010/03/02 19:34:49 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.285 2010/03/02 19:30:34 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.286 2010/03/02 19:34:49 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -92,6 +92,9 @@
#include
#include
#include
+#include
+#include
+#include
#include
@@ -340,6 +343,14 @@
#endif
}
+/* old cleaner syscall interface. see VOP_FCNTL() */
+static const struct syscall_package lfs_syscalls[] = {
+ { SYS_lfs_bmapv, 0, (sy_call_t *)sys_lfs_bmapv },
+ { SYS_lfs_markv, 0, (sy_call_t *)sys_lfs_markv },
+ { SYS_lfs_segclean, 0, (sy_call_t *)sys___lfs_segwait50 },
+ { 0, 0, NULL },
+};
+
static int
lfs_modcmd(modcmd_t cmd, void *arg)
{
@@ -347,15 +358,21 @@
switch (cmd) {
case MODULE_CMD_INIT:
+ error = syscall_establish(NULL, lfs_syscalls);
+ if (error)
+ return error;
error = vfs_attach(&lfs_vfsops);
- if (error != 0)
+ if (error != 0) {
+ syscall_disestablish(NULL, lfs_syscalls);
break;
+ }
lfs_sysctl_setup(&lfs_sysctl_log);
break;
case MODULE_CMD_FINI:
error = vfs_detach(&lfs_vfsops);
if (error != 0)
break;
+ syscall_disestablish(NULL, lfs_syscalls);
sysctl_teardown(&lfs_sysctl_log);
break;
default:
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: pooka Date: Tue Mar 2 19:34:49 UTC 2010 Modified Files: src/sys/ufs/lfs: lfs_vfsops.c Log Message: load lfs syscalls in modload To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/sys/ufs/lfs/lfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Tue Mar 2 19:34:27 UTC 2010 Modified Files: src/sys/kern: syscalls.master Log Message: Make lfs syscalls loadable. This nukes fs_lfs.h & #ifdef LFS. (I don't mind if someone wants to go further and OBSOL them). To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/sys/kern/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Tue Mar 2 19:34:27 UTC 2010
Modified Files:
src/sys/kern: syscalls.master
Log Message:
Make lfs syscalls loadable. This nukes fs_lfs.h & #ifdef LFS.
(I don't mind if someone wants to go further and OBSOL them).
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/sys/kern/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.231 src/sys/kern/syscalls.master:1.232
--- src/sys/kern/syscalls.master:1.231 Thu Nov 26 17:20:20 2009
+++ src/sys/kern/syscalls.master Tue Mar 2 19:34:26 2010
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp $
+ $NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -47,8 +47,6 @@
#include "opt_ntp.h"
#include "opt_sysv.h"
-#include "fs_lfs.h"
-
#include
#include
#include
@@ -358,20 +356,13 @@
181 STD { int|sys||setgid(gid_t gid); }
182 STD { int|sys||setegid(gid_t egid); }
183 STD { int|sys||seteuid(uid_t euid); }
-#if defined(LFS) || !defined(_KERNEL)
-184 STD { int|sys||lfs_bmapv(fsid_t *fsidp, \
+184 STD MODULAR { int|sys||lfs_bmapv(fsid_t *fsidp, \
struct block_info *blkiov, int blkcnt); }
-185 STD { int|sys||lfs_markv(fsid_t *fsidp, \
+185 STD MODULAR { int|sys||lfs_markv(fsid_t *fsidp, \
struct block_info *blkiov, int blkcnt); }
-186 STD { int|sys||lfs_segclean(fsid_t *fsidp, u_long segment); }
+186 STD MODULAR { int|sys||lfs_segclean(fsid_t *fsidp, u_long segment); }
187 COMPAT_50 MODULAR { int|sys||lfs_segwait(fsid_t *fsidp, \
struct timeval50 *tv); }
-#else
-184 EXCL lfs_bmapv
-185 EXCL lfs_markv
-186 EXCL lfs_segclean
-187 EXCL lfs_segwait
-#endif
188 COMPAT_12 MODULAR { int|sys||stat(const char *path, struct stat12 *ub); } \
stat12
189 COMPAT_12 MODULAR { int|sys||fstat(int fd, struct stat12 *sb); } fstat12
@@ -809,12 +800,8 @@
const struct timeval *tptr); }
421 STD { int|sys|50|adjtime(const struct timeval *delta, \
struct timeval *olddelta); }
-#if defined(LFS) || !defined(_KERNEL)
-422 STD { int|sys|50|lfs_segwait(fsid_t *fsidp, \
+422 STD MODULAR { int|sys|50|lfs_segwait(fsid_t *fsidp, \
struct timeval *tv); }
-#else
-422 EXCL __lfs_segwait50
-#endif
423 STD RUMP { int|sys|50|futimes(int fd, \
const struct timeval *tptr); }
424 STD RUMP { int|sys|50|lutimes(const char *path, \
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Tue Mar 2 19:33:12 UTC 2010 Modified Files: src/sys/kern: makesyscalls.sh syscalls.conf Log Message: Make is possible to add extra output at the top of syscallargs.h. Use this feature to stick sys/mount.h in there. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/kern/makesyscalls.sh cvs rdiff -u -r1.14 -r1.15 src/sys/kern/syscalls.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Tue Mar 2 19:33:12 UTC 2010
Modified Files:
src/sys/kern: makesyscalls.sh syscalls.conf
Log Message:
Make is possible to add extra output at the top of syscallargs.h.
Use this feature to stick sys/mount.h in there.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/kern/makesyscalls.sh
cvs rdiff -u -r1.14 -r1.15 src/sys/kern/syscalls.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.93 src/sys/kern/makesyscalls.sh:1.94
--- src/sys/kern/makesyscalls.sh:1.93 Tue Jan 5 15:23:32 2010
+++ src/sys/kern/makesyscalls.sh Tue Mar 2 19:33:12 2010
@@ -1,5 +1,5 @@
#! /bin/sh -
-# $NetBSD: makesyscalls.sh,v 1.93 2010/01/05 15:23:32 skrll Exp $
+# $NetBSD: makesyscalls.sh,v 1.94 2010/03/02 19:33:12 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -134,6 +134,7 @@
sysprotos = \"$sysprotos\"
sysnumhdr = \"$sysnumhdr\"
sysarghdr = \"$sysarghdr\"
+ sysarghdrextra = \"$sysarghdrextra\"
rumpcalls = \"$rumpcalls\"
rumpcallshdr = \"$rumpcallshdr\"
rumpsysent = \"$rumpsysent\"
@@ -254,6 +255,7 @@
printf "#define _" constprefix "SYSCALL_H_\n\n" > sysnumhdr
printf "#ifndef _" constprefix "SYSCALLARGS_H_\n" > sysarghdr
printf "#define _" constprefix "SYSCALLARGS_H_\n\n" > sysarghdr
+ printf "%s", sysarghdrextra > sysarghdr
# Write max number of system call arguments to both headers
printf("#define\t%sMAXSYSARGS\t%d\n\n", constprefix, maxsysargs) \
> sysnumhdr
Index: src/sys/kern/syscalls.conf
diff -u src/sys/kern/syscalls.conf:1.14 src/sys/kern/syscalls.conf:1.15
--- src/sys/kern/syscalls.conf:1.14 Mon Nov 17 08:46:42 2008
+++ src/sys/kern/syscalls.conf Tue Mar 2 19:33:12 2010
@@ -1,9 +1,10 @@
-# $NetBSD: syscalls.conf,v 1.14 2008/11/17 08:46:42 pooka Exp $
+# $NetBSD: syscalls.conf,v 1.15 2010/03/02 19:33:12 pooka Exp $
sysnames="syscalls.c"
sysnumhdr="../sys/syscall.h"
syssw="init_sysent.c"
sysarghdr="../sys/syscallargs.h"
+sysarghdrextra='#include \n\n'
sysalign=1
rumpcalls="../rump/librump/rumpkern/rump_syscalls.c"
rumpcallshdr="../rump/include/rump/rump_syscalls.h"
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: pooka
Date: Tue Mar 2 19:30:34 UTC 2010
Modified Files:
src/sys/ufs/lfs: lfs_vfsops.c
Log Message:
/*
* XXX: Get extra reference to LFS vfsops. This prevents unload,
* but also prevents kernel panic due to text being unloaded
* from below lfs_writerd. When lfs_writerd can exit, remove
* this!!!
*/
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/ufs/lfs/lfs_vfsops.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/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.284 src/sys/ufs/lfs/lfs_vfsops.c:1.285
--- src/sys/ufs/lfs/lfs_vfsops.c:1.284 Thu Feb 18 01:14:00 2010
+++ src/sys/ufs/lfs/lfs_vfsops.c Tue Mar 2 19:30:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.284 2010/02/18 01:14:00 eeh Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.285 2010/03/02 19:30:34 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.284 2010/02/18 01:14:00 eeh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.285 2010/03/02 19:30:34 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -1047,6 +1047,13 @@
if (lfs_writer_daemon == 0 && kthread_create(PRI_BIO, 0, NULL,
lfs_writerd, NULL, NULL, "lfs_writer") != 0)
panic("fork lfs_writer");
+ /*
+ * XXX: Get extra reference to LFS vfsops. This prevents unload,
+ * but also prevents kernel panic due to text being unloaded
+ * from below lfs_writerd. When lfs_writerd can exit, remove
+ * this!!!
+ */
+ vfs_getopsbyname(MOUNT_LFS);
printf("WARNING: the log-structured file system is experimental\n"
"WARNING: it may cause system crashes and/or corrupt data\n");
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: pooka Date: Tue Mar 2 19:30:34 UTC 2010 Modified Files: src/sys/ufs/lfs: lfs_vfsops.c Log Message: /* * XXX: Get extra reference to LFS vfsops. This prevents unload, * but also prevents kernel panic due to text being unloaded * from below lfs_writerd. When lfs_writerd can exit, remove * this!!! */ To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/sys/ufs/lfs/lfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Tue Mar 2 18:44:47 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_ec.c acpi_madt.c acpi_powerres.c
acpi_resource.c aiboost.c atk0110.c dalb_acpi.c fdc_acpi.c
sony_acpi.c
Log Message:
Format string cosmetics (mainly from %d to %u).
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/acpi/acpi_madt.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/acpi_powerres.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/aiboost.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/atk0110.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/dalb_acpi.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/sony_acpi.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.c
diff -u src/sys/dev/acpi/acpi.c:1.149 src/sys/dev/acpi/acpi.c:1.150
--- src/sys/dev/acpi/acpi.c:1.149 Wed Feb 24 22:37:56 2010
+++ src/sys/dev/acpi/acpi.c Tue Mar 2 18:44:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.149 2010/02/24 22:37:56 dyoung Exp $ */
+/* $NetBSD: acpi.c,v 1.150 2010/03/02 18:44:46 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.149 2010/02/24 22:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.150 2010/03/02 18:44:46 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -515,7 +515,7 @@
sc->sc_sleepstate = ACPI_STATE_S0;
/* Show SCI interrupt. */
- aprint_verbose_dev(self, "SCI interrupting at int %d\n",
+ aprint_verbose_dev(self, "SCI interrupting at int %u\n",
AcpiGbl_FADT.SciInterrupt);
/*
@@ -976,7 +976,7 @@
aprint_normal("buffer %p ", obj->Buffer.Pointer);
break;
default:
- aprint_normal("type %d ",obj->Type);
+ aprint_normal("type %u ",obj->Type);
break;
}
ACPI_FREE(buf.Pointer);
@@ -1638,7 +1638,7 @@
resn->Length = resp->Length;
break;
default:
- printf("acpi_allocate_resources: res=%d\n", resc->Type);
+ printf("acpi_allocate_resources: res=%u\n", resc->Type);
rv = AE_BAD_DATA;
goto out2;
}
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.60 src/sys/dev/acpi/acpi_ec.c:1.61
--- src/sys/dev/acpi/acpi_ec.c:1.60 Wed Feb 24 22:37:56 2010
+++ src/sys/dev/acpi/acpi_ec.c Tue Mar 2 18:44:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.60 2010/02/24 22:37:56 dyoung Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger .
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.60 2010/02/24 22:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $");
#include
#include
@@ -190,7 +190,7 @@
if (ecdt->Control.BitWidth != 8 || ecdt->Data.BitWidth != 8) {
aprint_error_dev(parent,
- "ECDT register width invalid (%d/%d)\n",
+ "ECDT register width invalid (%u/%u)\n",
ecdt->Control.BitWidth, ecdt->Data.BitWidth);
return false;
}
Index: src/sys/dev/acpi/acpi_madt.c
diff -u src/sys/dev/acpi/acpi_madt.c:1.19 src/sys/dev/acpi/acpi_madt.c:1.20
--- src/sys/dev/acpi/acpi_madt.c:1.19 Mon Jan 7 06:04:07 2008
+++ src/sys/dev/acpi/acpi_madt.c Tue Mar 2 18:44:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.c,v 1.19 2008/01/07 06:04:07 tnn Exp $ */
+/* $NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.19 2008/01/07 06:04:07 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $");
#include
#include
@@ -131,14 +131,14 @@
static void
acpi_print_lapic_ovr(ACPI_MADT_LOCAL_APIC_OVERRIDE *p)
{
- printf("lapic addr override: 0x%llx\n", (unsigned long long)p->Address);
+ printf("lapic addr override: 0x%"PRIx64"\n", p->Address);
}
static void
acpi_print_iosapic(ACPI_MADT_IO_SAPIC *p)
{
- printf("iosapic: sapid %u address 0x%llx int vector base 0x%x\n",
- p->Id, (unsigned long long)p->Address, p->GlobalIrqBase);
+ printf("iosapic: sapid %u address 0x%"PRIx64" int vector base 0x%x\n",
+ p->Id, p->Address, p->GlobalIrqBase);
}
static void
@@ -223,7 +223,7 @@
acpi_print_platint((void *)hdrp);
break;
default:
- printf("Unknown MADT entry type %d\n", hdrp->Type);
+ printf("Unknown MADT entry type %u\n", hdrp->Type);
break;
}
return AE_OK;
Index: src/sys/dev/acpi/acpi_powerres.c
diff -u src/sys/dev/acpi/acpi_powerres.c:1.9 src/sys/dev/acpi/acpi_powerres.c:1.10
--- src/sys/dev/acpi/acpi_powerres.c:1.9 Mon Jan 18 18:36:50
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Tue Mar 2 18:44:47 UTC 2010 Modified Files: src/sys/dev/acpi: acpi.c acpi_ec.c acpi_madt.c acpi_powerres.c acpi_resource.c aiboost.c atk0110.c dalb_acpi.c fdc_acpi.c sony_acpi.c Log Message: Format string cosmetics (mainly from %d to %u). To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/acpi/acpi_ec.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/acpi/acpi_madt.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/acpi_powerres.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/acpi_resource.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/aiboost.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/atk0110.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/dalb_acpi.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/fdc_acpi.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/sony_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/lfs
Module Name:src Committed By: pooka Date: Tue Mar 2 18:00:25 UTC 2010 Modified Files: src/sys/modules/lfs: Makefile Log Message: Remove the ufs_vnops.c hacks from the lfs module, since ffs (and hence ufs) has been required by lfs for ages now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/lfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/lfs/Makefile diff -u src/sys/modules/lfs/Makefile:1.2 src/sys/modules/lfs/Makefile:1.3 --- src/sys/modules/lfs/Makefile:1.2 Sun Nov 16 15:39:19 2008 +++ src/sys/modules/lfs/Makefile Tue Mar 2 18:00:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/11/16 15:39:19 ad Exp $ +# $NetBSD: Makefile,v 1.3 2010/03/02 18:00:24 pooka Exp $ .include "../Makefile.inc" @@ -6,13 +6,9 @@ lfs_vnops.o: ufs_readwrite.c -COPTS+= -DLFS -Dufs_mkdir=lfs_ufs_mkdir -Dufs_makeinode=lfs_ufs_makeinode \ - -Dufs_strategy=lfs_ufs_strategy -Dufs_whiteout=lfs_ufs_whiteout \ - -Dufs_link=lfs_ufs_link -Dufs_rename=lfs_ufs_rename - KMOD= lfs SRCS= lfs_vfsops.c lfs_vnops.c lfs_subr.c lfs_alloc.c lfs_balloc.c \ lfs_bio.c lfs_cksum.c lfs_debug.c lfs_inode.c lfs_segment.c \ - lfs_syscalls.c ufs_vnops.c lfs_itimes.c + lfs_syscalls.c lfs_itimes.c .include
CVS commit: src/sys/modules/lfs
Module Name:src Committed By: pooka Date: Tue Mar 2 18:00:25 UTC 2010 Modified Files: src/sys/modules/lfs: Makefile Log Message: Remove the ufs_vnops.c hacks from the lfs module, since ffs (and hence ufs) has been required by lfs for ages now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/lfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Tue Mar 2 17:28:09 UTC 2010 Modified Files: src/sys/arch/arc/arc: machdep.c src/sys/arch/hpcmips/hpcmips: machdep.c src/sys/arch/hpcsh/hpcsh: machdep.c src/sys/arch/landisk/landisk: machdep.c src/sys/arch/mipsco/mipsco: machdep.c src/sys/arch/newsmips/newsmips: machdep.c src/sys/arch/pmax/pmax: machdep.c src/sys/ufs: files.ufs Log Message: Remove fs_mfs.h from users because it is now unnecessary and don't generate fs_mfs.h anymore. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/sys/arch/arc/arc/machdep.c cvs rdiff -u -r1.109 -r1.110 src/sys/arch/hpcmips/hpcmips/machdep.c cvs rdiff -u -r1.70 -r1.71 src/sys/arch/hpcsh/hpcsh/machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/landisk/landisk/machdep.c cvs rdiff -u -r1.71 -r1.72 src/sys/arch/mipsco/mipsco/machdep.c cvs rdiff -u -r1.108 -r1.109 src/sys/arch/newsmips/newsmips/machdep.c cvs rdiff -u -r1.239 -r1.240 src/sys/arch/pmax/pmax/machdep.c cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/files.ufs 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/arc/arc/machdep.c diff -u src/sys/arch/arc/arc/machdep.c:1.120 src/sys/arch/arc/arc/machdep.c:1.121 --- src/sys/arch/arc/arc/machdep.c:1.120 Mon Feb 8 19:02:26 2010 +++ src/sys/arch/arc/arc/machdep.c Tue Mar 2 17:28:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.120 2010/02/08 19:02:26 joerg Exp $ */ +/* $NetBSD: machdep.c,v 1.121 2010/03/02 17:28:08 pooka Exp $ */ /* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */ /* @@ -78,9 +78,8 @@ /* from: Utah Hdr: machdep.c 1.63 91/04/24 */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2010/02/08 19:02:26 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121 2010/03/02 17:28:08 pooka Exp $"); -#include "fs_mfs.h" #include "opt_ddb.h" #include "opt_ddbparam.h" #include "opt_md.h" @@ -108,9 +107,7 @@ #include #include #include -#ifdef MFS #include /* mfs_initminiroot() */ -#endif #include #include @@ -401,14 +398,12 @@ sprintf(cpu_model, "%s %s%s", platform->vendor, platform->model, platform->variant); -#ifdef MFS /* * Check to see if a mini-root was loaded into memory. It resides * at the start of the next page just after the end of BSS. */ if (boothowto & RB_MINIROOT) kernend += round_page(mfs_initminiroot(kernend)); -#endif #if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ Index: src/sys/arch/hpcmips/hpcmips/machdep.c diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.109 src/sys/arch/hpcmips/hpcmips/machdep.c:1.110 --- src/sys/arch/hpcmips/hpcmips/machdep.c:1.109 Mon Feb 8 19:02:29 2010 +++ src/sys/arch/hpcmips/hpcmips/machdep.c Tue Mar 2 17:28:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.109 2010/02/08 19:02:29 joerg Exp $ */ +/* $NetBSD: machdep.c,v 1.110 2010/03/02 17:28:08 pooka Exp $ */ /*- * Copyright (c) 1999 Shin Takemura, All rights reserved. @@ -108,7 +108,7 @@ */ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.109 2010/02/08 19:02:29 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.110 2010/03/02 17:28:08 pooka Exp $"); #include "opt_vr41xx.h" #include "opt_tx39xx.h" @@ -116,7 +116,6 @@ #include "opt_modular.h" #include "opt_spec_platform.h" #include "biconsdev.h" -#include "fs_mfs.h" #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_rtc_offset.h" @@ -430,7 +429,6 @@ } } } -#ifdef MFS /* * Check to see if a mini-root was loaded into memory. It resides * at the start of the next page just after the end of BSS. @@ -443,7 +441,6 @@ #endif /* MEMORY_DISK_DYNAMIC */ kernend = (char *)kernend + fssz; } -#endif /* MFS */ #if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ Index: src/sys/arch/hpcsh/hpcsh/machdep.c diff -u src/sys/arch/hpcsh/hpcsh/machdep.c:1.70 src/sys/arch/hpcsh/hpcsh/machdep.c:1.71 --- src/sys/arch/hpcsh/hpcsh/machdep.c:1.70 Fri Nov 27 03:23:09 2009 +++ src/sys/arch/hpcsh/hpcsh/machdep.c Tue Mar 2 17:28:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.70 2009/11/27 03:23:09 rmind Exp $ */ +/* $NetBSD: machdep.c,v 1.71 2010/03/02 17:28:08 pooka Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -27,13 +27,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2009/11/27 03:23:09 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2010/03/02 17:28:08 pooka Exp $"); #include "opt_md.h" #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_modular.h" -#include "fs_mfs.h" #include "fs_nfs.h" #include "biconsdev.h" #include "debug_hpc.h" @@ -256,7 +255,6 @@ } } -#ifdef MFS /* * Check to see if a mini-root was loaded into memory. It resides * at the start of the next page just
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Tue Mar 2 17:28:09 UTC 2010 Modified Files: src/sys/arch/arc/arc: machdep.c src/sys/arch/hpcmips/hpcmips: machdep.c src/sys/arch/hpcsh/hpcsh: machdep.c src/sys/arch/landisk/landisk: machdep.c src/sys/arch/mipsco/mipsco: machdep.c src/sys/arch/newsmips/newsmips: machdep.c src/sys/arch/pmax/pmax: machdep.c src/sys/ufs: files.ufs Log Message: Remove fs_mfs.h from users because it is now unnecessary and don't generate fs_mfs.h anymore. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/sys/arch/arc/arc/machdep.c cvs rdiff -u -r1.109 -r1.110 src/sys/arch/hpcmips/hpcmips/machdep.c cvs rdiff -u -r1.70 -r1.71 src/sys/arch/hpcsh/hpcsh/machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/landisk/landisk/machdep.c cvs rdiff -u -r1.71 -r1.72 src/sys/arch/mipsco/mipsco/machdep.c cvs rdiff -u -r1.108 -r1.109 src/sys/arch/newsmips/newsmips/machdep.c cvs rdiff -u -r1.239 -r1.240 src/sys/arch/pmax/pmax/machdep.c cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/files.ufs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs
Module Name:src Committed By: pooka Date: Tue Mar 2 17:23:36 UTC 2010 Modified Files: src/sys/ufs: files.ufs Log Message: Make mfs_initminiroot() mandatory. Allows to remove #ifdef MFS. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/files.ufs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/files.ufs diff -u src/sys/ufs/files.ufs:1.21 src/sys/ufs/files.ufs:1.22 --- src/sys/ufs/files.ufs:1.21 Tue Mar 2 16:43:48 2010 +++ src/sys/ufs/files.ufs Tue Mar 2 17:23:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.ufs,v 1.21 2010/03/02 16:43:48 pooka Exp $ +# $NetBSD: files.ufs,v 1.22 2010/03/02 17:23:36 pooka Exp $ deffs FFS deffs EXT2FS @@ -50,6 +50,7 @@ file ufs/mfs/mfs_vfsops.c mfs file ufs/mfs/mfs_vnops.c mfs +file ufs/mfs/mfs_miniroot.c file ufs/ufs/ufs_bmap.c ffs | lfs | mfs | ext2fs file ufs/ufs/ufs_dirhash.c (ffs | lfs | mfs | ext2fs) & ufs_dirhash
CVS commit: src/sys/ufs
Module Name:src Committed By: pooka Date: Tue Mar 2 17:23:36 UTC 2010 Modified Files: src/sys/ufs: files.ufs Log Message: Make mfs_initminiroot() mandatory. Allows to remove #ifdef MFS. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/files.ufs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/mfs
Module Name:src Committed By: pooka Date: Tue Mar 2 17:20:03 UTC 2010 Modified Files: src/sys/ufs/mfs: mfs_extern.h mfs_vfsops.c Added Files: src/sys/ufs/mfs: mfs_miniroot.c Log Message: Make mfs_initminiroot() mandatory. Allows to remove #ifdef MFS. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/ufs/mfs/mfs_extern.h cvs rdiff -u -r0 -r1.1 src/sys/ufs/mfs/mfs_miniroot.c cvs rdiff -u -r1.101 -r1.102 src/sys/ufs/mfs/mfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/mfs
Module Name:src
Committed By: pooka
Date: Tue Mar 2 17:20:03 UTC 2010
Modified Files:
src/sys/ufs/mfs: mfs_extern.h mfs_vfsops.c
Added Files:
src/sys/ufs/mfs: mfs_miniroot.c
Log Message:
Make mfs_initminiroot() mandatory. Allows to remove #ifdef MFS.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/ufs/mfs/mfs_extern.h
cvs rdiff -u -r0 -r1.1 src/sys/ufs/mfs/mfs_miniroot.c
cvs rdiff -u -r1.101 -r1.102 src/sys/ufs/mfs/mfs_vfsops.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/ufs/mfs/mfs_extern.h
diff -u src/sys/ufs/mfs/mfs_extern.h:1.30 src/sys/ufs/mfs/mfs_extern.h:1.31
--- src/sys/ufs/mfs/mfs_extern.h:1.30 Sat Jun 28 01:34:05 2008
+++ src/sys/ufs/mfs/mfs_extern.h Tue Mar 2 17:20:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mfs_extern.h,v 1.30 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: mfs_extern.h,v 1.31 2010/03/02 17:20:02 pooka Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -69,6 +69,8 @@
#include
extern kmutex_t mfs_lock;
+extern void *mfs_rootbase;
+extern u_long mfs_rootsize;
#endif
Index: src/sys/ufs/mfs/mfs_vfsops.c
diff -u src/sys/ufs/mfs/mfs_vfsops.c:1.101 src/sys/ufs/mfs/mfs_vfsops.c:1.102
--- src/sys/ufs/mfs/mfs_vfsops.c:1.101 Tue Jan 13 13:35:54 2009
+++ src/sys/ufs/mfs/mfs_vfsops.c Tue Mar 2 17:20:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mfs_vfsops.c,v 1.101 2009/01/13 13:35:54 yamt Exp $ */
+/* $NetBSD: mfs_vfsops.c,v 1.102 2010/03/02 17:20:02 pooka Exp $ */
/*
* Copyright (c) 1989, 1990, 1993, 1994
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfs_vfsops.c,v 1.101 2009/01/13 13:35:54 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfs_vfsops.c,v 1.102 2010/03/02 17:20:02 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -68,11 +68,10 @@
MODULE(MODULE_CLASS_VFS, mfs, "ffs");
-void * mfs_rootbase; /* address of mini-root in kernel virtual memory */
-u_long mfs_rootsize; /* size of mini-root in bytes */
kmutex_t mfs_lock; /* global lock */
-static int mfs_minor; /* used for building internal dev_t */
+/* used for building internal dev_t, minor == 0 reserved for miniroot */
+static int mfs_minor = 1;
static int mfs_initcnt;
extern int (**mfs_vnodeop_p)(void *);
@@ -241,27 +240,6 @@
}
/*
- * This is called early in boot to set the base address and size
- * of the mini-root.
- */
-int
-mfs_initminiroot(void *base)
-{
- struct fs *fs = (struct fs *)((char *)base + SBLOCK_UFS1);
-
- /* check for valid super block */
- if (fs->fs_magic != FS_UFS1_MAGIC || fs->fs_bsize > MAXBSIZE ||
- fs->fs_bsize < sizeof(struct fs))
- return (0);
- rootfstype = MOUNT_MFS;
- mfs_rootbase = base;
- mfs_rootsize = fs->fs_fsize * fs->fs_size;
- rootdev = makedev(255, mfs_minor);
- mfs_minor++;
- return (mfs_rootsize);
-}
-
-/*
* VFS Operations.
*
* mount system call
Added files:
Index: src/sys/ufs/mfs/mfs_miniroot.c
diff -u /dev/null src/sys/ufs/mfs/mfs_miniroot.c:1.1
--- /dev/null Tue Mar 2 17:20:03 2010
+++ src/sys/ufs/mfs/mfs_miniroot.c Tue Mar 2 17:20:02 2010
@@ -0,0 +1,68 @@
+/* $NetBSD: mfs_miniroot.c,v 1.1 2010/03/02 17:20:02 pooka Exp $ */
+
+/*
+ * Copyright (c) 1989, 1990, 1993, 1994
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: mfs_miniroot.c,v 1.1 2010/03/02 17:20:02
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: dyoung Date: Tue Mar 2 16:44:08 UTC 2010 Modified Files: src/sys/arch/xen/xen: hypervisor.c Log Message: Re-zero the attach args before setting them up for a new call to config_found_ia(). In this way we avoid passing an uninitialized pcibus_attach_args.pba_pc that will cause problems, later. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/xen/xen/hypervisor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: dyoung
Date: Tue Mar 2 16:44:08 UTC 2010
Modified Files:
src/sys/arch/xen/xen: hypervisor.c
Log Message:
Re-zero the attach args before setting them up for a new call to
config_found_ia(). In this way we avoid passing an uninitialized
pcibus_attach_args.pba_pc that will cause problems, later.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/xen/xen/hypervisor.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/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.50 src/sys/arch/xen/xen/hypervisor.c:1.51
--- src/sys/arch/xen/xen/hypervisor.c:1.50 Fri Oct 23 02:32:34 2009
+++ src/sys/arch/xen/xen/hypervisor.c Tue Mar 2 16:44:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.50 2009/10/23 02:32:34 snj Exp $ */
+/* $NetBSD: hypervisor.c,v 1.51 2010/03/02 16:44:08 dyoung Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.50 2009/10/23 02:32:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.51 2010/03/02 16:44:08 dyoung Exp $");
#include
#include
@@ -207,7 +207,7 @@
xengnt_init();
- memset(&hac.hac_vcaa, 0, sizeof(hac.hac_vcaa));
+ memset(&hac, 0, sizeof(hac));
hac.hac_vcaa.vcaa_name = "vcpu";
hac.hac_vcaa.vcaa_caa.cpu_number = 0;
hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_SP;
@@ -217,22 +217,27 @@
events_init();
#if NXENBUS > 0
+ memset(&hac, 0, sizeof(hac));
hac.hac_xenbus.xa_device = "xenbus";
config_found_ia(self, "xendevbus", &hac.hac_xenbus, hypervisor_print);
#endif
#if NXENCONS > 0
+ memset(&hac, 0, sizeof(hac));
hac.hac_xencons.xa_device = "xencons";
config_found_ia(self, "xendevbus", &hac.hac_xencons, hypervisor_print);
#endif
#if NXENNET_HYPERVISOR > 0
+ memset(&hac, 0, sizeof(hac));
hac.hac_xennet.xa_device = "xennet";
xennet_scan(self, &hac.hac_xennet, hypervisor_print);
#endif
#if NXBD_HYPERVISOR > 0
+ memset(&hac, 0, sizeof(hac));
hac.hac_xbd.xa_device = "xbd";
xbd_scan(self, &hac.hac_xbd, hypervisor_print);
#endif
#if NNPX > 0
+ memset(&hac, 0, sizeof(hac));
hac.hac_xennpx.xa_device = "npx";
config_found_ia(self, "xendevbus", &hac.hac_xennpx, hypervisor_print);
#endif
@@ -240,6 +245,7 @@
#if NPCI > 0
#if NACPICA > 0
if (acpi_present) {
+ memset(&hac, 0, sizeof(hac));
hac.hac_acpi.aa_iot = X86_BUS_SPACE_IO;
hac.hac_acpi.aa_memt = X86_BUS_SPACE_MEM;
hac.hac_acpi.aa_pc = NULL;
@@ -251,6 +257,7 @@
config_found_ia(self, "acpibus", &hac.hac_acpi, 0);
}
#endif /* NACPICA */
+ memset(&hac, 0, sizeof(hac));
hac.hac_pba.pba_iot = X86_BUS_SPACE_IO;
hac.hac_pba.pba_memt = X86_BUS_SPACE_MEM;
hac.hac_pba.pba_dmat = &pci_bus_dma_tag;
@@ -279,6 +286,7 @@
#endif
#if NISA > 0
if (isa_has_been_seen == 0) {
+ memset(&hac, 0, sizeof(hac));
hac.hac_iba._iba_busname = "isa";
hac.hac_iba.iba_iot = X86_BUS_SPACE_IO;
hac.hac_iba.iba_memt = X86_BUS_SPACE_MEM;
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Tue Mar 2 16:43:48 UTC 2010 Modified Files: src/sys/coda: files.coda src/sys/fs/nilfs: files.nilfs src/sys/fs/ntfs: files.ntfs src/sys/fs/ptyfs: files.ptyfs src/sys/fs/tmpfs: files.tmpfs src/sys/fs/udf: files.udf src/sys/fs/union: files.union src/sys/fs/unionfs: files.unionfs src/sys/ufs: files.ufs Removed Files: src/sys/rump/librump/rumpkern/opt: fs_ffs.h fs_union.h Log Message: Don't generate unused fs_thefs.h headers. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/coda/files.coda cvs rdiff -u -r1.1 -r1.2 src/sys/fs/nilfs/files.nilfs cvs rdiff -u -r1.1 -r1.2 src/sys/fs/ntfs/files.ntfs cvs rdiff -u -r1.2 -r1.3 src/sys/fs/ptyfs/files.ptyfs cvs rdiff -u -r1.2 -r1.3 src/sys/fs/tmpfs/files.tmpfs cvs rdiff -u -r1.3 -r1.4 src/sys/fs/udf/files.udf cvs rdiff -u -r1.1 -r1.2 src/sys/fs/union/files.union cvs rdiff -u -r1.1 -r1.2 src/sys/fs/unionfs/files.unionfs cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpkern/opt/fs_ffs.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/opt/fs_union.h cvs rdiff -u -r1.20 -r1.21 src/sys/ufs/files.ufs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
