CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: haad Date: Mon May 10 06:10:59 UTC 2010 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_znode.c Log Message: Get new vnode when creating zfs share dir for it's znode. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.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/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.6 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.7 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.6 Sat Feb 27 23:43:53 2010 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Mon May 10 06:10:59 2010 @@ -484,7 +484,8 @@ sharezp-z_zfsvfs = zfsvfs; vp = ZTOV(sharezp); - vn_reinit(vp); + error = getnewvnode(VT_ZFS, zfsvfs-z_parent-z_vfs, + zfs_vnodeop_p, zp-z_vnode); vp-v_type = VDIR; VERIFY(0 == zfs_acl_ids_create(sharezp, IS_ROOT_NODE, vattr,
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: haad
Date: Mon May 10 06:15:28 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: spa.c
Log Message:
Fix spa_thread to compile under the NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.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/cddl/osnet/dist/uts/common/fs/zfs/spa.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c:1.3 Sat Feb 27 23:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c Mon May 10 06:15:28 2010
@@ -1,3 +1,4 @@
+
/*
* CDDL HEADER START
*
@@ -671,13 +672,14 @@
callb_cpr_t cprinfo;
spa_t *spa = arg;
-#ifdef PORT_SOLARIS
- user_t *pu = PTOU(curproc);
CALLB_CPR_INIT(cprinfo, spa-spa_proc_lock, callb_generic_cpr,
spa-spa_name);
ASSERT(curproc != p0);
+#ifdef PORT_SOLARIS
+ user_t *pu = PTOU(curproc);
+
(void) snprintf(pu-u_psargs, sizeof (pu-u_psargs),
zpool-%s, spa-spa_name);
(void) strlcpy(pu-u_comm, pu-u_psargs, sizeof (pu-u_comm));
@@ -753,7 +755,7 @@
ASSERT(spa-spa_proc_state == SPA_PROC_NONE);
ASSERT(spa-spa_proc == p0);
spa-spa_did = 0;
-
+#if 0
/* Only create a process if we're going to be around a while. */
if (spa_create_process strcmp(spa-spa_name, TRYIMPORT_NAME) != 0) {
if (newproc(spa_thread, (caddr_t)spa, syscid, maxclsyspri,
@@ -773,7 +775,8 @@
spa-spa_name);
#endif
}
- }
+ }
+#endif
mutex_exit(spa-spa_proc_lock);
/* If we didn't create a process, we need to create our taskqs. */
CVS commit: src/external/cddl/osnet/include
Module Name:src Committed By: haad Date: Mon May 10 06:26:11 UTC 2010 Modified Files: src/external/cddl/osnet/include: thread.h Log Message: If thread_create was called with thread_id = NULL use our local thread id as replacement otherwise we will crash. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/include/thread.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/include/thread.h diff -u src/external/cddl/osnet/include/thread.h:1.2 src/external/cddl/osnet/include/thread.h:1.3 --- src/external/cddl/osnet/include/thread.h:1.2 Mon May 3 00:31:32 2010 +++ src/external/cddl/osnet/include/thread.h Mon May 10 06:26:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: thread.h,v 1.2 2010/05/03 00:31:32 haad Exp $ */ +/* $NetBSD: thread.h,v 1.3 2010/05/10 06:26:11 haad Exp $ */ /* * CDDL HEADER START @@ -91,9 +91,16 @@ if(flags THR_DETACHED) pthread_attr_setdetachstate(attr, PTHREAD_CREATE_DETACHED); + thread_t th_id; + thread_t *t_id; + if(new_thread_ID != NULL) + t_id = new_thread_ID; + else + t_id = th_id; + /* This function ignores the THR_BOUND flag, since NPTL doesn't seem to support PTHREAD_SCOPE_PROCESS */ - ret = pthread_create(new_thread_ID, attr, start_func, arg); + ret = pthread_create(t_id, attr, start_func, arg); pthread_attr_destroy(attr);
CVS commit: src/external/cddl/osnet/lib/libumem
Module Name:src Committed By: haad Date: Mon May 10 06:27:57 UTC 2010 Modified Files: src/external/cddl/osnet/lib/libumem: Makefile Log Message: Disable building of stub_stand.c we build all locking primitives in libzpool. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libumem/Makefile 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/lib/libumem/Makefile diff -u src/external/cddl/osnet/lib/libumem/Makefile:1.4 src/external/cddl/osnet/lib/libumem/Makefile:1.5 --- src/external/cddl/osnet/lib/libumem/Makefile:1.4 Sun Feb 28 22:45:45 2010 +++ src/external/cddl/osnet/lib/libumem/Makefile Mon May 10 06:27:57 2010 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2010/02/28 22:45:45 haad Exp $ +# $NetBSD: Makefile,v 1.5 2010/05/10 06:27:57 haad Exp $ LIB= umem -SRCS= umem.c stub_stand.c +SRCS= umem.c .include ../../Makefile.zfs .include bsd.lib.mk
CVS commit: src/sys/dev/pci
Module Name:src Committed By: matt Date: Mon May 10 06:38:45 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add MARVELL 88SB2211 PCIe-PCI bridge To generate a diff of this commit: cvs rdiff -u -r1.1029 -r1.1030 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1029 src/sys/dev/pci/pcidevs:1.1030 --- src/sys/dev/pci/pcidevs:1.1029 Sat May 8 07:18:46 2010 +++ src/sys/dev/pci/pcidevs Mon May 10 06:38:45 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1029 2010/05/08 07:18:46 pgoyette Exp $ +$NetBSD: pcidevs,v 1.1030 2010/05/10 06:38:45 matt Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1988,6 +1988,7 @@ product MARVELL 88W8310 0x1fa7 Libertas 88W8310 product MARVELL 88W8335_1 0x1faa Libertas 88W8335 product MARVELL 88W8335_2 0x1fab Libertas 88W8335 +product MARVELL 88SB2211 0x2211 88SB2211 x1 PCIe-PCI Bridge product MARVELL 88W8300_2 0x2a01 Libertas 88W8300 product MARVELL GT64115 0x4111 GT-64115 System Controller product MARVELL GT64011 0x4146 GT-64011 System Controller
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src Committed By: matt Date: Mon May 10 06:55:25 UTC 2010 Modified Files: src/sys/dev/pci [matt-nb5-mips64]: pcidevs Log Message: Add Marvell 88SB2211 To generate a diff of this commit: cvs rdiff -u -r1.962.4.1.4.3 -r1.962.4.1.4.4 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.962.4.1.4.3 src/sys/dev/pci/pcidevs:1.962.4.1.4.4 --- src/sys/dev/pci/pcidevs:1.962.4.1.4.3 Tue Apr 20 22:03:26 2010 +++ src/sys/dev/pci/pcidevs Mon May 10 06:55:25 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.962.4.1.4.3 2010/04/20 22:03:26 matt Exp $ +$NetBSD: pcidevs,v 1.962.4.1.4.4 2010/05/10 06:55:25 matt Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1914,6 +1914,7 @@ product MARVELL 88W8310 0x1fa7 Libertas 88W8310 product MARVELL 88W8335_1 0x1faa Libertas 88W8335 product MARVELL 88W8335_2 0x1fab Libertas 88W8335 +product MARVELL 88SB2211 0x2211 88SB2211 x1 PCIe-PCI Bridge product MARVELL 88W8300_2 0x2a01 Libertas 88W8300 product MARVELL GT64115 0x4111 GT-64115 System Controller product MARVELL GT64011 0x4146 GT-64011 System Controller
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src
Committed By: matt
Date: Mon May 10 06:55:51 UTC 2010
Modified Files:
src/sys/dev/pci [matt-nb5-mips64]: pcidevs.h pcidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.963.4.1.4.3 -r1.963.4.1.4.4 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.962.4.1.4.3 -r1.962.4.1.4.4 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.1.4.3 src/sys/dev/pci/pcidevs.h:1.963.4.1.4.4
--- src/sys/dev/pci/pcidevs.h:1.963.4.1.4.3 Wed Apr 21 00:27:42 2010
+++ src/sys/dev/pci/pcidevs.h Mon May 10 06:55:44 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.963.4.1.4.3 2010/04/21 00:27:42 matt Exp $ */
+/* $NetBSD: pcidevs.h,v 1.963.4.1.4.4 2010/05/10 06:55:44 matt Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.1.4.3 2010/04/20 22:03:26 matt Exp
+ * NetBSD: pcidevs,v 1.962.4.1.4.4 2010/05/10 06:55:25 matt Exp
*/
/*
@@ -1921,6 +1921,7 @@
#define PCI_PRODUCT_MARVELL_88W8310 0x1fa7 /* Libertas 88W8310 */
#define PCI_PRODUCT_MARVELL_88W8335_1 0x1faa /* Libertas 88W8335 */
#define PCI_PRODUCT_MARVELL_88W8335_2 0x1fab /* Libertas 88W8335 */
+#define PCI_PRODUCT_MARVELL_88SB2211 0x2211 /* 88SB2211 x1 PCIe-PCI Bridge */
#define PCI_PRODUCT_MARVELL_88W8300_2 0x2a01 /* Libertas 88W8300 */
#define PCI_PRODUCT_MARVELL_GT64115 0x4111 /* GT-64115 System Controller */
#define PCI_PRODUCT_MARVELL_GT64011 0x4146 /* GT-64011 System Controller */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.3 src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.4
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.3 Wed Apr 21 00:27:42 2010
+++ src/sys/dev/pci/pcidevs_data.h Mon May 10 06:55:44 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.962.4.1.4.3 2010/04/21 00:27:42 matt Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.962.4.1.4.4 2010/05/10 06:55:44 matt Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.1.4.3 2010/04/20 22:03:26 matt Exp
+ * NetBSD: pcidevs,v 1.962.4.1.4.4 2010/05/10 06:55:25 matt Exp
*/
/*
@@ -6644,6 +6644,10 @@
Libertas 88W8335,
},
{
+ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88SB2211,
+ 88SB2211 x1 PCIe-PCI Bridge,
+ },
+ {
PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_88W8300_2,
Libertas 88W8300,
},
@@ -14836,4 +14840,4 @@
Video Controller,
},
};
-const int pci_nproducts = 3107;
+const int pci_nproducts = 3108;
CVS commit: src/sys/dev/ieee1394
Module Name:src
Committed By: kiyohara
Date: Mon May 10 12:17:33 UTC 2010
Modified Files:
src/sys/dev/ieee1394: firewire.c fwdev.c fwdma.c fwmem.c fwohci.c
if_fwip.c sbp.c
Log Message:
Use kmem(9) instead of malloc(9).
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ieee1394/firewire.c \
src/sys/dev/ieee1394/sbp.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ieee1394/fwdev.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ieee1394/fwdma.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ieee1394/fwmem.c
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/ieee1394/fwohci.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ieee1394/if_fwip.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/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.30 src/sys/dev/ieee1394/firewire.c:1.31
--- src/sys/dev/ieee1394/firewire.c:1.30 Tue Apr 6 10:45:15 2010
+++ src/sys/dev/ieee1394/firewire.c Mon May 10 12:17:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.30 2010/04/06 10:45:15 reinoud Exp $ */
+/* $NetBSD: firewire.c,v 1.31 2010/05/10 12:17:32 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: firewire.c,v 1.30 2010/04/06 10:45:15 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: firewire.c,v 1.31 2010/05/10 12:17:32 kiyohara Exp $);
#include sys/param.h
#include sys/bus.h
@@ -48,7 +48,7 @@
#include sys/errno.h
#include sys/kernel.h
#include sys/kthread.h
-#include sys/malloc.h
+#include sys/kmem.h
#include sys/queue.h
#include sys/sysctl.h
#include sys/systm.h
@@ -217,28 +217,24 @@
if (fc-nisodma FWMAXNDMA)
fc-nisodma = FWMAXNDMA;
- fc-crom_src_buf =
- (struct crom_src_buf *)malloc(sizeof(struct crom_src_buf),
- M_FW, M_NOWAIT | M_ZERO);
+ fc-crom_src_buf = kmem_zalloc(sizeof(struct crom_src_buf), KM_NOSLEEP);
if (fc-crom_src_buf == NULL) {
- aprint_error_dev(fc-bdev, Malloc Failure crom src buff\n);
+ aprint_error_dev(fc-bdev,
+ kmem alloc failure crom src buff\n);
return;
}
fc-topology_map =
- (struct fw_topology_map *)malloc(sizeof(struct fw_topology_map),
- M_FW, M_NOWAIT | M_ZERO);
+ kmem_zalloc(sizeof(struct fw_topology_map), KM_NOSLEEP);
if (fc-topology_map == NULL) {
aprint_error_dev(fc-dev, Malloc Failure topology map\n);
- free(fc-crom_src_buf, M_FW);
+ kmem_free(fc-crom_src_buf, sizeof(struct crom_src_buf));
return;
}
- fc-speed_map =
- (struct fw_speed_map *)malloc(sizeof(struct fw_speed_map),
- M_FW, M_NOWAIT | M_ZERO);
+ fc-speed_map = kmem_zalloc(sizeof(struct fw_speed_map), KM_NOSLEEP);
if (fc-speed_map == NULL) {
aprint_error_dev(fc-dev, Malloc Failure speed map\n);
- free(fc-crom_src_buf, M_FW);
- free(fc-topology_map, M_FW);
+ kmem_free(fc-crom_src_buf, sizeof(struct crom_src_buf));
+ kmem_free(fc-topology_map, sizeof(struct fw_topology_map));
return;
}
@@ -262,7 +258,7 @@
aprint_error_dev(self, kthread_create failed\n);
config_pending_incr();
- devlist = malloc(sizeof(struct firewire_dev_list), M_DEVBUF, M_NOWAIT);
+ devlist = kmem_alloc(sizeof(struct firewire_dev_list), KM_NOSLEEP);
if (devlist == NULL) {
aprint_error_dev(self, device list allocation failed\n);
return;
@@ -273,7 +269,7 @@
faa.fwdev = NULL;
devlist-dev = config_found(sc-dev, faa, firewire_print);
if (devlist-dev == NULL)
- free(devlist, M_DEVBUF);
+ kmem_free(devlist, sizeof(struct firewire_dev_list));
else
SLIST_INSERT_HEAD(sc-devlist, devlist, link);
@@ -315,7 +311,7 @@
if ((err = config_detach(devlist-dev, flags)) != 0)
return err;
SLIST_REMOVE(sc-devlist, devlist, firewire_dev_list, link);
- free(devlist, M_DEVBUF);
+ kmem_free(devlist, sizeof(struct firewire_dev_list));
}
callout_stop(fc-timeout_callout);
@@ -326,11 +322,11 @@
for (fwdev = STAILQ_FIRST(fc-devices); fwdev != NULL;
fwdev = fwdev_next) {
fwdev_next = STAILQ_NEXT(fwdev, link);
- free(fwdev, M_FW);
+ kmem_free(fwdev, sizeof(struct fw_device));
}
- free(fc-topology_map, M_FW);
- free(fc-speed_map, M_FW);
- free(fc-crom_src_buf, M_FW);
+ kmem_free(fc-topology_map, sizeof(struct fw_topology_map));
+ kmem_free(fc-speed_map, sizeof(struct fw_speed_map));
+ kmem_free(fc-crom_src_buf, sizeof(struct crom_src_buf));
cv_destroy(fc-fc_cv);
mutex_destroy(fc-wait_lock);
@@ -586,7 +582,7 @@
* Configuration ROM.
*/
#define FW_MAX_GENERATION 0xF
- newrom = malloc(CROMSIZE, M_FW, M_NOWAIT | M_ZERO);
+ newrom = kmem_zalloc(CROMSIZE, KM_NOSLEEP);
src = fc-crom_src_buf-src;
crom_load(src, newrom, CROMSIZE);
if (memcmp(newrom, fc-config_rom, CROMSIZE) != 0) {
@@ -594,7 +590,7 @@
src-businfo.generation = FW_GENERATION_CHANGEABLE;
memcpy((void *)fc-config_rom, newrom, CROMSIZE);
}
- free(newrom, M_FW);
+
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: tsutsui
Date: Mon May 10 14:33:22 UTC 2010
Modified Files:
src/sys/dev/sun: bwtwo.c
Log Message:
Make this compile on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sun/bwtwo.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/sun/bwtwo.c
diff -u src/sys/dev/sun/bwtwo.c:1.28 src/sys/dev/sun/bwtwo.c:1.29
--- src/sys/dev/sun/bwtwo.c:1.28 Sat Sep 19 07:07:42 2009
+++ src/sys/dev/sun/bwtwo.c Mon May 10 14:33:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo.c,v 1.28 2009/09/19 07:07:42 tsutsui Exp $ */
+/* $NetBSD: bwtwo.c,v 1.29 2010/05/10 14:33:21 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bwtwo.c,v 1.28 2009/09/19 07:07:42 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: bwtwo.c,v 1.29 2010/05/10 14:33:21 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -117,7 +117,7 @@
const struct cdevsw bwtwo_cdevsw = {
bwtwoopen, nullclose, noread, nowrite, bwtwoioctl,
- nostop, notty, nopoll, bwtwommap, nokqfilter,
+ nostop, notty, nopoll, bwtwommap, nokqfilter, D_OTHER
};
/* XXX we do not handle frame buffer interrupts (do not know how) */
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Mon May 10 14:41:27 UTC 2010 Update of /cvsroot/src/libexec/httpd In directory ivanova.netbsd.org:/tmp/cvs-serv163 Log Message: import bozohttpd 20100510 -- just fixes some compile errors. Status: Vendor Tag: bozohttpd Release Tags: bozohttpd-20100510 U src/libexec/httpd/CHANGES U src/libexec/httpd/Makefile C src/libexec/httpd/Makefile.boot C src/libexec/httpd/auth-bozo.c U src/libexec/httpd/bozohttpd.8 C src/libexec/httpd/bozohttpd.c C src/libexec/httpd/bozohttpd.h C src/libexec/httpd/cgi-bozo.c U src/libexec/httpd/content-bozo.c C src/libexec/httpd/daemon-bozo.c U src/libexec/httpd/dir-index-bozo.c U src/libexec/httpd/main.c U src/libexec/httpd/queue.h U src/libexec/httpd/ssl-bozo.c C src/libexec/httpd/tilde-luzah-bozo.c U src/libexec/httpd/debug/Makefile U src/libexec/httpd/libbozohttpd/Makefile U src/libexec/httpd/libbozohttpd/libbozohttpd.3 U src/libexec/httpd/libbozohttpd/shlib_version U src/libexec/httpd/lua/Makefile U src/libexec/httpd/lua/bozo.lua U src/libexec/httpd/lua/glue.c U src/libexec/httpd/lua/optparse.lua U src/libexec/httpd/lua/shlib_version U src/libexec/httpd/small/Makefile U src/libexec/httpd/testsuite/Makefile U src/libexec/httpd/testsuite/html_cmp U src/libexec/httpd/testsuite/t1.in U src/libexec/httpd/testsuite/t1.out U src/libexec/httpd/testsuite/t10.in U src/libexec/httpd/testsuite/t10.out U src/libexec/httpd/testsuite/t2.in U src/libexec/httpd/testsuite/t2.out U src/libexec/httpd/testsuite/t3.in U src/libexec/httpd/testsuite/t3.out U src/libexec/httpd/testsuite/t4.in U src/libexec/httpd/testsuite/t4.out U src/libexec/httpd/testsuite/t5.in U src/libexec/httpd/testsuite/t5.out U src/libexec/httpd/testsuite/t6.in U src/libexec/httpd/testsuite/t6.out U src/libexec/httpd/testsuite/t7.in U src/libexec/httpd/testsuite/t7.out U src/libexec/httpd/testsuite/t8.in U src/libexec/httpd/testsuite/t8.out U src/libexec/httpd/testsuite/t9.in U src/libexec/httpd/testsuite/t9.out U src/libexec/httpd/testsuite/test-bigfile U src/libexec/httpd/testsuite/data/bigfile U src/libexec/httpd/testsuite/data/bigfile.partial4000 U src/libexec/httpd/testsuite/data/bigfile.partial8000 U src/libexec/httpd/testsuite/data/file U src/libexec/httpd/testsuite/data/index.html 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jbozohttpd:yesterday -jbozohttpd src/libexec/httpd
CVS commit: src/libexec/httpd
Module Name:src
Committed By: mrg
Date: Mon May 10 14:44:19 UTC 2010
Modified Files:
src/libexec/httpd: Makefile.boot auth-bozo.c bozohttpd.c bozohttpd.h
cgi-bozo.c daemon-bozo.c tilde-luzah-bozo.c
Log Message:
merge bozohttpd 20100510.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/libexec/httpd/Makefile.boot
cvs rdiff -u -r1.8 -r1.9 src/libexec/httpd/auth-bozo.c \
src/libexec/httpd/daemon-bozo.c
cvs rdiff -u -r1.16 -r1.17 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.12 -r1.13 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.15 -r1.16 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/tilde-luzah-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/Makefile.boot
diff -u src/libexec/httpd/Makefile.boot:1.4 src/libexec/httpd/Makefile.boot:1.5
--- src/libexec/httpd/Makefile.boot:1.4 Mon May 10 03:37:45 2010
+++ src/libexec/httpd/Makefile.boot Mon May 10 14:44:19 2010
@@ -1,10 +1,10 @@
-# $eterna: Makefile.boot,v 1.8 2010/05/10 02:24:30 mrg Exp $
+# $eterna: Makefile.boot,v 1.9 2010/05/10 04:57:50 mrg Exp $
#
# very simple makefile to compile bozohttpd, should work with every make.
# see Makefile for a list of compile options that may be placed in CFLAGS.
CC= cc
-CFLAGS= -O
+CFLAGS= -O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
GROFF= groff -Tascii
CRYPTOLIBDIR= # -L/usr/local/lib
@@ -14,7 +14,7 @@
dir-index-bozo.c ssl-bozo.c tilde-luzah-bozo.c main.c
all:
- $(CC) $(CFLAGS) -o bozohttpd $(FILES) $(CRYPTOLIBS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o bozohttpd $(FILES) $(CRYPTOLIBS)
man:
$(GROFF) -mandoc bozohttpd.8 bozohttpd.cat8
Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.8 src/libexec/httpd/auth-bozo.c:1.9
--- src/libexec/httpd/auth-bozo.c:1.8 Mon May 10 03:37:45 2010
+++ src/libexec/httpd/auth-bozo.c Mon May 10 14:44:19 2010
@@ -1,6 +1,6 @@
-/* $NetBSD: auth-bozo.c,v 1.8 2010/05/10 03:37:45 mrg Exp $ */
+/* $NetBSD: auth-bozo.c,v 1.9 2010/05/10 14:44:19 mrg Exp $ */
-/* $eterna: auth-bozo.c,v 1.15 2010/05/10 02:51:28 mrg Exp $ */
+/* $eterna: auth-bozo.c,v 1.16 2010/05/10 14:36:37 mrg Exp $ */
/*
* Copyright (c) 1997-2010 Matthew R. Green
@@ -53,8 +53,9 @@
* Check if HTTP authentication is required
*/
int
-bozo_auth_check(bozohttpd_t *httpd, bozo_httpreq_t *request, const char *file)
+bozo_auth_check(bozo_httpreq_t *request, const char *file)
{
+ bozohttpd_t *httpd = request-hr_httpd;
struct stat sb;
char dir[MAXPATHLEN], authfile[MAXPATHLEN], *basename;
char user[BUFSIZ], *pass;
@@ -68,7 +69,7 @@
else {
*basename++ = '\0';
/* ensure basename(file) != AUTH_FILE */
- if (bozo_check_special_files(httpd, request, basename))
+ if (bozo_check_special_files(request, basename))
return 1;
}
request-hr_authrealm = bozostrdup(httpd, dir);
@@ -127,8 +128,10 @@
}
int
-bozo_auth_check_headers(bozohttpd_t *httpd, bozo_httpreq_t *request, char *val, char *str, ssize_t len)
+bozo_auth_check_headers(bozo_httpreq_t *request, char *val, char *str, ssize_t len)
{
+ bozohttpd_t *httpd = request-hr_httpd;
+
if (strcasecmp(val, authorization) == 0
strncasecmp(str, Basic , 6) == 0) {
char authbuf[BUFSIZ];
@@ -158,9 +161,11 @@
}
int
-bozo_auth_check_special_files(bozohttpd_t *httpd, bozo_httpreq_t *request,
+bozo_auth_check_special_files(bozo_httpreq_t *request,
const char *name)
{
+ bozohttpd_t *httpd = request-hr_httpd;
+
if (strcmp(name, AUTH_FILE) == 0)
return bozo_http_error(httpd, 403, request,
no permission to open authfile);
@@ -168,8 +173,10 @@
}
void
-bozo_auth_check_401(bozohttpd_t *httpd, bozo_httpreq_t *request, int code)
+bozo_auth_check_401(bozo_httpreq_t *request, int code)
{
+ bozohttpd_t *httpd = request-hr_httpd;
+
if (code == 401)
bozo_printf(httpd,
WWW-Authenticate: Basic realm=\%s\\r\n,
@@ -179,9 +186,11 @@
#ifndef NO_CGIBIN_SUPPORT
void
-bozo_auth_cgi_setenv(bozohttpd_t *httpd, bozo_httpreq_t *request,
+bozo_auth_cgi_setenv(bozo_httpreq_t *request,
char ***curenvpp)
{
+ bozohttpd_t *httpd = request-hr_httpd;
+
if (request-hr_authuser *request-hr_authuser) {
bozo_setenv(httpd, AUTH_TYPE, Basic, (*curenvpp)++);
bozo_setenv(httpd, REMOTE_USER, request-hr_authuser,
Index: src/libexec/httpd/daemon-bozo.c
diff -u src/libexec/httpd/daemon-bozo.c:1.8 src/libexec/httpd/daemon-bozo.c:1.9
--- src/libexec/httpd/daemon-bozo.c:1.8 Mon May 10 03:37:45 2010
+++ src/libexec/httpd/daemon-bozo.c Mon May 10 14:44:19 2010
@@ -1,6 +1,6 @@
-/* $NetBSD: daemon-bozo.c,v 1.8 2010/05/10 03:37:45 mrg Exp $ */
+/* $NetBSD: daemon-bozo.c,v 1.9 2010/05/10 14:44:19 mrg Exp $ */
-/* $eterna: daemon-bozo.c,v 1.19 2010/05/10 02:51:28 mrg Exp $ */
+/* $eterna: daemon-bozo.c,v 1.20 2010/05/10 04:39:00 mrg Exp $ */
/*
* Copyright (c) 1997-2010 Matthew R. Green
@@ -136,7 +136,6 @@
static
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Mon May 10 14:50:50 UTC 2010 Update of /cvsroot/src/libexec/httpd In directory ivanova.netbsd.org:/tmp/cvs-serv60 Log Message: re-do this with the right sources this time. Status: Vendor Tag: bozohttpd Release Tags: bozohttpd-20100510 U src/libexec/httpd/CHANGES U src/libexec/httpd/Makefile U src/libexec/httpd/Makefile.boot U src/libexec/httpd/auth-bozo.c C src/libexec/httpd/bozohttpd.8 C src/libexec/httpd/bozohttpd.c U src/libexec/httpd/bozohttpd.h U src/libexec/httpd/cgi-bozo.c U src/libexec/httpd/content-bozo.c U src/libexec/httpd/daemon-bozo.c U src/libexec/httpd/dir-index-bozo.c U src/libexec/httpd/main.c U src/libexec/httpd/queue.h U src/libexec/httpd/ssl-bozo.c U src/libexec/httpd/tilde-luzah-bozo.c U src/libexec/httpd/debug/Makefile U src/libexec/httpd/libbozohttpd/Makefile U src/libexec/httpd/libbozohttpd/libbozohttpd.3 U src/libexec/httpd/libbozohttpd/shlib_version U src/libexec/httpd/lua/Makefile U src/libexec/httpd/lua/bozo.lua U src/libexec/httpd/lua/glue.c U src/libexec/httpd/lua/optparse.lua U src/libexec/httpd/lua/shlib_version U src/libexec/httpd/small/Makefile U src/libexec/httpd/testsuite/Makefile U src/libexec/httpd/testsuite/html_cmp U src/libexec/httpd/testsuite/t1.in U src/libexec/httpd/testsuite/t1.out U src/libexec/httpd/testsuite/t10.in U src/libexec/httpd/testsuite/t10.out U src/libexec/httpd/testsuite/t2.in U src/libexec/httpd/testsuite/t2.out U src/libexec/httpd/testsuite/t3.in U src/libexec/httpd/testsuite/t3.out U src/libexec/httpd/testsuite/t4.in U src/libexec/httpd/testsuite/t4.out U src/libexec/httpd/testsuite/t5.in U src/libexec/httpd/testsuite/t5.out U src/libexec/httpd/testsuite/t6.in U src/libexec/httpd/testsuite/t6.out U src/libexec/httpd/testsuite/t7.in U src/libexec/httpd/testsuite/t7.out U src/libexec/httpd/testsuite/t8.in U src/libexec/httpd/testsuite/t8.out U src/libexec/httpd/testsuite/t9.in U src/libexec/httpd/testsuite/t9.out U src/libexec/httpd/testsuite/test-bigfile U src/libexec/httpd/testsuite/data/bigfile U src/libexec/httpd/testsuite/data/bigfile.partial4000 U src/libexec/httpd/testsuite/data/bigfile.partial8000 U src/libexec/httpd/testsuite/data/file U src/libexec/httpd/testsuite/data/index.html 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jbozohttpd:yesterday -jbozohttpd src/libexec/httpd
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Mon May 10 14:53:18 UTC 2010 Modified Files: src/libexec/httpd: bozohttpd.8 bozohttpd.c Log Message: merge 20100510 properly To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/libexec/httpd/bozohttpd.8 \ src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.17 src/libexec/httpd/bozohttpd.8:1.18 --- src/libexec/httpd/bozohttpd.8:1.17 Mon May 10 03:37:45 2010 +++ src/libexec/httpd/bozohttpd.8 Mon May 10 14:53:17 2010 @@ -1,6 +1,6 @@ -.\ $NetBSD: bozohttpd.8,v 1.17 2010/05/10 03:37:45 mrg Exp $ +.\ $NetBSD: bozohttpd.8,v 1.18 2010/05/10 14:53:17 mrg Exp $ .\ -.\ $eterna: bozohttpd.8,v 1.93 2010/05/10 02:51:28 mrg Exp $ +.\ $eterna: bozohttpd.8,v 1.94 2010/05/10 14:49:19 mrg Exp $ .\ .\ Copyright (c) 1997-2010 Matthew R. Green .\ All rights reserved. @@ -27,6 +27,7 @@ .\ SUCH DAMAGE. .\ .Dd May 22, 2009 +.Dd May 10, 2010 .Dt HTTPD 8 .Os .Sh NAME @@ -458,7 +459,7 @@ and regular code audits. This manual documents .Nm -version 20090522. +version 20100510. .Sh AUTHORS .Nm was written by Matthew R. Green Index: src/libexec/httpd/bozohttpd.c diff -u src/libexec/httpd/bozohttpd.c:1.17 src/libexec/httpd/bozohttpd.c:1.18 --- src/libexec/httpd/bozohttpd.c:1.17 Mon May 10 14:44:19 2010 +++ src/libexec/httpd/bozohttpd.c Mon May 10 14:53:17 2010 @@ -1,6 +1,6 @@ -/* $NetBSD: bozohttpd.c,v 1.17 2010/05/10 14:44:19 mrg Exp $ */ +/* $NetBSD: bozohttpd.c,v 1.18 2010/05/10 14:53:17 mrg Exp $ */ -/* $eterna: bozohttpd.c,v 1.167 2010/05/10 14:36:37 mrg Exp $ */ +/* $eterna: bozohttpd.c,v 1.168 2010/05/10 14:49:19 mrg Exp $ */ /* * Copyright (c) 1997-2010 Matthew R. Green @@ -109,7 +109,7 @@ #define INDEX_HTML index.html #endif #ifndef SERVER_SOFTWARE -#define SERVER_SOFTWARE bozohttpd/20100509 +#define SERVER_SOFTWARE bozohttpd/20100510 #endif #ifndef DIRECT_ACCESS_FILE #define DIRECT_ACCESS_FILE .bzdirect
CVS commit: src/sys/arch/atari/stand/binpatch
Module Name:src
Committed By: tsutsui
Date: Mon May 10 15:10:54 UTC 2010
Modified Files:
src/sys/arch/atari/stand/binpatch: Makefile
Log Message:
Include bsd.own.mk before ${NETBSDSRCDIR}.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/atari/stand/binpatch/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/arch/atari/stand/binpatch/Makefile
diff -u src/sys/arch/atari/stand/binpatch/Makefile:1.6 src/sys/arch/atari/stand/binpatch/Makefile:1.7
--- src/sys/arch/atari/stand/binpatch/Makefile:1.6 Thu Aug 20 15:14:49 2009
+++ src/sys/arch/atari/stand/binpatch/Makefile Mon May 10 15:10:54 2010
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.6 2009/08/20 15:14:49 tsutsui Exp $
+# $NetBSD: Makefile,v 1.7 2010/05/10 15:10:54 tsutsui Exp $
BINDIR?= /sbin
WARNS?= 4
+NOMAN=
+
+.include bsd.own.mk
PROG= binpatch
SRCS= binpatch.c
SRCS+= exec_aout.c exec_ecoff.c exec_elf32.c exec_elf64.c exec_coff.c
#MAN= binpatch.8 # currently it's in src/share/man/man8/man8.atari
-NOMAN=
MDSETIMAGE=${NETBSDSRCDIR}/usr.sbin/mdsetimage
CPPFLAGS+= -I${MDSETIMAGE}
.PATH: ${MDSETIMAGE}
-.include bsd.own.mk # for ${MACHINE_CPU}
-
.if ${MACHINE_ARCH} == alpha
CPPFLAGS+=-DNLIST_ECOFF
CPPFLAGS+=-DNLIST_ELF64
CVS commit: src/usr.bin/unzip
Module Name:src
Committed By: joerg
Date: Mon May 10 15:45:22 UTC 2010
Modified Files:
src/usr.bin/unzip: unzip.c
Log Message:
Kill a left-over break from the for-loop that vanished in 1.13.
Issue noticed by tnn.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/unzip/unzip.c
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/unzip/unzip.c
diff -u src/usr.bin/unzip/unzip.c:1.13 src/usr.bin/unzip/unzip.c:1.14
--- src/usr.bin/unzip/unzip.c:1.13 Thu Apr 29 06:32:19 2010
+++ src/usr.bin/unzip/unzip.c Mon May 10 15:45:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: unzip.c,v 1.13 2010/04/29 06:32:19 joerg Exp $ */
+/* $NetBSD: unzip.c,v 1.14 2010/05/10 15:45:22 joerg Exp $ */
/*-
* Copyright (c) 2009, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: unzip.c,v 1.13 2010/04/29 06:32:19 joerg Exp $);
+__RCSID($NetBSD: unzip.c,v 1.14 2010/05/10 15:45:22 joerg Exp $);
#include sys/queue.h
#include sys/stat.h
@@ -572,10 +572,8 @@
* guess wrong, we print a warning message later.
*/
if (a_opt n == 0) {
- if (check_binary(buffer, len)) {
+ if (check_binary(buffer, len))
text = 0;
-break;
- }
}
/* simple case */
CVS commit: [matt-nb5-mips64] src/gnu/usr.bin/gcc4/arch
Module Name:src
Committed By: matt
Date: Mon May 10 16:08:56 UTC 2010
Modified Files:
src/gnu/usr.bin/gcc4/arch/mips64eb [matt-nb5-mips64]: defs.mk
src/gnu/usr.bin/gcc4/arch/mips64el [matt-nb5-mips64]: defs.mk
Log Message:
Add MASK_SOFT_FLOAT to G_target_cpu_default
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/gnu/usr.bin/gcc4/arch/mips64eb/defs.mk
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/gnu/usr.bin/gcc4/arch/mips64el/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gcc4/arch/mips64eb/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/mips64eb/defs.mk:1.1.2.2 src/gnu/usr.bin/gcc4/arch/mips64eb/defs.mk:1.1.2.3
--- src/gnu/usr.bin/gcc4/arch/mips64eb/defs.mk:1.1.2.2 Wed Dec 9 07:28:24 2009
+++ src/gnu/usr.bin/gcc4/arch/mips64eb/defs.mk Mon May 10 16:08:56 2010
@@ -35,7 +35,7 @@
G_host_xm_file=
G_host_xm_defines=
G_tm_p_file=
-G_target_cpu_default=((MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SPLIT_ADDRESSES))|MASK_EXPLICIT_RELOCS
+G_target_cpu_default=((MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SPLIT_ADDRESSES|MASK_SOFT_FLOAT))|MASK_EXPLICIT_RELOCS
G_TM_H=tm.h options.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/mips/mips.h ${GNUHOSTDIST}/gcc/config/mips/elf.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/mips/netbsd.h ${GNUHOSTDIST}/gcc/config/mips/netbsd64.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h
G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/mips/mips.opt
G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/mips/mips.h ${GNUHOSTDIST}/gcc/config/mips/elf.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/mips/netbsd.h ${GNUHOSTDIST}/gcc/config/mips/netbsd64.h ${GNUHOSTDIST}/gcc/defaults.h
Index: src/gnu/usr.bin/gcc4/arch/mips64el/defs.mk
diff -u src/gnu/usr.bin/gcc4/arch/mips64el/defs.mk:1.1.2.2 src/gnu/usr.bin/gcc4/arch/mips64el/defs.mk:1.1.2.3
--- src/gnu/usr.bin/gcc4/arch/mips64el/defs.mk:1.1.2.2 Wed Dec 9 04:37:29 2009
+++ src/gnu/usr.bin/gcc4/arch/mips64el/defs.mk Mon May 10 16:08:56 2010
@@ -35,7 +35,7 @@
G_host_xm_file=
G_host_xm_defines=
G_tm_p_file=
-G_target_cpu_default=((MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SPLIT_ADDRESSES))|MASK_EXPLICIT_RELOCS
+G_target_cpu_default=((MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SPLIT_ADDRESSES|MASK_SOFT_FLOAT))|MASK_EXPLICIT_RELOCS
G_TM_H=tm.h options.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/mips/mips.h ${GNUHOSTDIST}/gcc/config/mips/elf.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/mips/netbsd.h ${GNUHOSTDIST}/gcc/config/mips/netbsd64.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h
G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/mips/mips.opt
G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/mips/mips.h ${GNUHOSTDIST}/gcc/config/mips/elf.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/mips/netbsd.h ${GNUHOSTDIST}/gcc/config/mips/netbsd64.h ${GNUHOSTDIST}/gcc/defaults.h
CVS commit: src/sys/arch
Module Name:src
Committed By: dyoung
Date: Mon May 10 18:46:59 UTC 2010
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: bus_space.c pmap.c
src/sys/arch/xen/conf: files.xen
Added Files:
src/sys/arch/xen/x86: xen_pmap.c
Log Message:
Provide pmap_enter_ma(), pmap_extract_ma(), pmap_kenter_ma() in all x86
kernels, and use them in the bus_space(9) implementation instead of ugly
Xen #ifdef-age. In a non-Xen kernel, the _ma() functions either call or
alias the equivalent _pa() functions.
Reviewed on port-...@netbsd.org and port-i...@netbsd.org. Passes
rmind@'s and bouyer@'s inspection. Tested on i386 and on Xen DOMU /
DOM0.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/x86/bus_space.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r0 -r1.1 src/sys/arch/xen/x86/xen_pmap.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/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.29 src/sys/arch/x86/include/pmap.h:1.30
--- src/sys/arch/x86/include/pmap.h:1.29 Tue Feb 9 22:51:13 2010
+++ src/sys/arch/x86/include/pmap.h Mon May 10 18:46:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.29 2010/02/09 22:51:13 jym Exp $ */
+/* $NetBSD: pmap.h,v 1.30 2010/05/10 18:46:58 dyoung Exp $ */
/*
*
@@ -228,6 +228,12 @@
void pmap_emap_remove(vaddr_t, vsize_t);
void pmap_emap_sync(bool);
+void pmap_map_ptes(struct pmap *, struct pmap **, pd_entry_t **,
+ pd_entry_t * const **);
+void pmap_unmap_ptes(struct pmap *, struct pmap *);
+
+int pmap_pdes_invalid(vaddr_t, pd_entry_t * const *, pd_entry_t *);
+
vaddr_t reserve_dumppages(vaddr_t); /* XXX: not a pmap fn */
void pmap_tlb_shootdown(pmap_t, vaddr_t, vaddr_t, pt_entry_t);
@@ -248,6 +254,12 @@
* inline functions
*/
+__inline static bool __unused
+pmap_pdes_valid(vaddr_t va, pd_entry_t * const *pdes, pd_entry_t *lastpde)
+{
+ return pmap_pdes_invalid(va, pdes, lastpde) == 0;
+}
+
/*
* pmap_update_pg: flush one page from the TLB (or flush the whole thing
* if hardware doesn't support one-page flushing)
@@ -401,17 +413,17 @@
/* Xen helpers to change bits of a pte */
#define XPMAP_UPDATE_DIRECT 1 /* Update direct map entry flags too */
+paddr_t vtomach(vaddr_t);
+#define vtomfn(va) (vtomach(va) PAGE_SHIFT)
+
+#endif /* XEN */
+
/* pmap functions with machine addresses */
void pmap_kenter_ma(vaddr_t, paddr_t, vm_prot_t, u_int);
int pmap_enter_ma(struct pmap *, vaddr_t, paddr_t, paddr_t,
vm_prot_t, u_int, int);
bool pmap_extract_ma(pmap_t, vaddr_t, paddr_t *);
-paddr_t vtomach(vaddr_t);
-#define vtomfn(va) (vtomach(va) PAGE_SHIFT)
-
-#endif /* XEN */
-
/*
* Hooks for the pool allocator.
*/
Index: src/sys/arch/x86/x86/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.28 src/sys/arch/x86/x86/bus_space.c:1.29
--- src/sys/arch/x86/x86/bus_space.c:1.28 Wed Apr 28 20:27:36 2010
+++ src/sys/arch/x86/x86/bus_space.c Mon May 10 18:46:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.28 2010/04/28 20:27:36 dyoung Exp $ */
+/* $NetBSD: bus_space.c,v 1.29 2010/05/10 18:46:58 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.28 2010/04/28 20:27:36 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.29 2010/05/10 18:46:58 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -48,9 +48,6 @@
#ifdef XEN
#include xen/hypervisor.h
-#include xen/xenpmap.h
-
-#define pmap_extract(a, b, c) pmap_extract_ma(a, b, c)
#endif
/*
@@ -339,11 +336,7 @@
*bshp = (bus_space_handle_t)(sva + (bpa PGOFSET));
for (va = sva; pa != endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-#ifdef XEN
pmap_kenter_ma(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
-#else
- pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, pmapflags);
-#endif /* XEN */
}
pmap_update(pmap_kernel());
@@ -395,7 +388,7 @@
}
#endif
- if (pmap_extract(pmap_kernel(), va, bpa) == FALSE) {
+ if (pmap_extract_ma(pmap_kernel(), va, bpa) == FALSE) {
panic(_x86_memio_unmap:
wrong virtual address);
}
@@ -447,7 +440,7 @@
panic(x86_memio_unmap: overflow);
#endif
- (void) pmap_extract(pmap_kernel(), va, bpa);
+ (void) pmap_extract_ma(pmap_kernel(), va, bpa);
bpa += (bsh PGOFSET);
pmap_kremove(va, endva - va);
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.108 src/sys/arch/x86/x86/pmap.c:1.109
--- src/sys/arch/x86/x86/pmap.c:1.108 Tue May 4 23:27:14 2010
+++ src/sys/arch/x86/x86/pmap.c Mon May 10 18:46:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.108 2010/05/04 23:27:14 jym Exp $ */
+/* $NetBSD: pmap.c,v 1.109
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: jnemeth Date: Mon May 10 20:28:05 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: misc.c Log Message: Fix tunnelling (ssh -w). The kernel expects a device to be passed to the socked, not a path. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/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/crypto/external/bsd/openssh/dist/misc.c diff -u src/crypto/external/bsd/openssh/dist/misc.c:1.2 src/crypto/external/bsd/openssh/dist/misc.c:1.3 --- src/crypto/external/bsd/openssh/dist/misc.c:1.2 Sun Jun 7 22:38:46 2009 +++ src/crypto/external/bsd/openssh/dist/misc.c Mon May 10 20:28:05 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.2 2009/06/07 22:38:46 christos Exp $ */ +/* $NetBSD: misc.c,v 1.3 2010/05/10 20:28:05 jnemeth Exp $ */ /* $OpenBSD: misc.c,v 1.71 2009/02/21 19:32:04 tobias Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -26,7 +26,7 @@ */ #include includes.h -__RCSID($NetBSD: misc.c,v 1.2 2009/06/07 22:38:46 christos Exp $); +__RCSID($NetBSD: misc.c,v 1.3 2010/05/10 20:28:05 jnemeth Exp $); #include sys/types.h #include sys/ioctl.h #include sys/socket.h @@ -676,6 +676,7 @@ debug(%s: %s mode %d fd %d, __func__, ifr.ifr_name, mode, fd); /* Set the tunnel device operation mode */ + snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), %s%d, tunbase, tun); if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) goto failed;
CVS commit: src/sys/arch/evbmips/gdium
Module Name:src Committed By: macallan Date: Tue May 11 01:38:15 UTC 2010 Modified Files: src/sys/arch/evbmips/gdium: gdium_genfb.c Log Message: use RI_NO_AUTO for the gdium's early rasops console so we don't try to allocate memory before kmem is ready To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/gdium/gdium_genfb.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/evbmips/gdium/gdium_genfb.c diff -u src/sys/arch/evbmips/gdium/gdium_genfb.c:1.3 src/sys/arch/evbmips/gdium/gdium_genfb.c:1.4 --- src/sys/arch/evbmips/gdium/gdium_genfb.c:1.3 Sat Aug 8 20:48:33 2009 +++ src/sys/arch/evbmips/gdium/gdium_genfb.c Tue May 11 01:38:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: gdium_genfb.c,v 1.3 2009/08/08 20:48:33 matt Exp $ */ +/* $NetBSD: gdium_genfb.c,v 1.4 2010/05/11 01:38:14 macallan Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gdium_genfb.c,v 1.3 2009/08/08 20:48:33 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: gdium_genfb.c,v 1.4 2010/05/11 01:38:14 macallan Exp $); #include sys/param.h #include sys/buf.h @@ -83,7 +83,7 @@ PCI_MAPREG_START); ri-ri_bits = (char *)MIPS_PHYS_TO_KSEG1(BONITO_PCILO_BASE + reg); - ri-ri_flg = RI_CENTER; + ri-ri_flg = RI_CENTER | RI_NO_AUTO; memset(ri-ri_bits, 0, 0x20);
CVS commit: src/sys/arch/amd64/amd64
Module Name:src
Committed By: joerg
Date: Tue May 11 02:34:40 UTC 2010
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c
Log Message:
Fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amd64/amd64/netbsd32_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/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.62 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.63
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.62 Fri Apr 23 19:18:09 2010
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Tue May 11 02:34:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.62 2010/04/23 19:18:09 rmind Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.63 2010/05/11 02:34:39 joerg Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_machdep.c,v 1.62 2010/04/23 19:18:09 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_machdep.c,v 1.63 2010/05/11 02:34:39 joerg Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -612,21 +612,21 @@
int error;
switch (SCARG(uap, op)) {
- case X86_IOPL:
- error = x86_iopl(l,
- NETBSD32PTR64(SCARG(uap, parms)), retval);
- break;
- case X86_GET_MTRR:
- error = x86_64_get_mtrr32(l,
- NETBSD32PTR64(SCARG(uap, parms)), retval);
- break;
- case X86_SET_MTRR:
- error = x86_64_set_mtrr32(l,
- NETBSD32PTR64(SCARG(uap, parms)), retval);
- break;
- default:
- error = EINVAL;
- break;
+ case X86_IOPL:
+ error = x86_iopl(l,
+ NETBSD32PTR64(SCARG(uap, parms)), retval);
+ break;
+ case X86_GET_MTRR:
+ error = x86_64_get_mtrr32(l,
+ NETBSD32PTR64(SCARG(uap, parms)), retval);
+ break;
+ case X86_SET_MTRR:
+ error = x86_64_set_mtrr32(l,
+ NETBSD32PTR64(SCARG(uap, parms)), retval);
+ break;
+ default:
+ error = EINVAL;
+ break;
}
return error;
}
