CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: mbalmer Date: Thu Aug 6 08:31:58 UTC 2009 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add gpio to rc checks. Diff from Geoff Wing g...@pobox.com, thanks. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.100 src/usr.sbin/postinstall/postinstall:1.101 --- src/usr.sbin/postinstall/postinstall:1.100 Mon Jul 20 21:03:42 2009 +++ src/usr.sbin/postinstall/postinstall Thu Aug 6 08:31:58 2009 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.100 2009/07/20 21:03:42 christos Exp $ +# $NetBSD: postinstall,v 1.101 2009/08/06 08:31:58 mbalmer Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -997,6 +997,7 @@ ccd cgd cleartmp cron \ dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \ fsck fsck_root ftp_proxy ftpd \ + gpio \ hostapd httpd \ identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \ irdaattach iscsi_target isdnd \
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Thu Aug 6 12:07:56 UTC 2009 Removed Files: src/sys/rump/librump/rumpvfs: genfs_io.c Log Message: Switch rump from the handwritten vnode pager to the standard kernel vnode pager. It would have been nice to keep a separate version: * it has helped find file system bugs which the kernel pager treated as non-errors * it does not contain extra payload unnecessary in userspace However, getting the details of the pager implementation correct with all the flags, offsets and block/page size special cases is *EXTREMELY* difficult (chuq god). On the plus side, LFS write now works for file data too instead of just metadata. Also, maybe being able to singlestep the genfs vnode pager in the comfort of userspace will allow more people to understand how the behemoth functions. To generate a diff of this commit: cvs rdiff -u -r1.13 -r0 src/sys/rump/librump/rumpvfs/genfs_io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src
Committed By: cegger
Date: Thu Aug 6 12:17:11 UTC 2009
Modified Files:
src/sys/netinet6: nd6.c
Log Message:
Check if ndi is valid before use.
ok tonnerre@
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/netinet6/nd6.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/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.132 src/sys/netinet6/nd6.c:1.133
--- src/sys/netinet6/nd6.c:1.132 Sat Jul 25 23:12:09 2009
+++ src/sys/netinet6/nd6.c Thu Aug 6 12:17:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.132 2009/07/25 23:12:09 tonnerre Exp $ */
+/* $NetBSD: nd6.c,v 1.133 2009/08/06 12:17:11 cegger Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.132 2009/07/25 23:12:09 tonnerre Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.133 2009/08/06 12:17:11 cegger Exp $);
#include opt_ipsec.h
@@ -767,7 +767,7 @@
nd6_setdefaultiface(0);
/* XXX: too restrictive? */
- if (!ip6_forwarding (ndi-flags ND6_IFF_ACCEPT_RTADV)) {
+ if (!ip6_forwarding ndi (ndi-flags ND6_IFF_ACCEPT_RTADV)) {
/* refresh default router list */
defrouter_select();
}
CVS commit: src/sys/dev/gpio
Module Name:src
Committed By: mbalmer
Date: Thu Aug 6 13:16:49 UTC 2009
Modified Files:
src/sys/dev/gpio: gpiosim.c
Log Message:
For the sake of correctness, call pmf_device_deregister() in the detach
function.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/gpio/gpiosim.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/gpio/gpiosim.c
diff -u src/sys/dev/gpio/gpiosim.c:1.4 src/sys/dev/gpio/gpiosim.c:1.5
--- src/sys/dev/gpio/gpiosim.c:1.4 Tue Jul 28 15:28:24 2009
+++ src/sys/dev/gpio/gpiosim.c Thu Aug 6 13:16:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.4 2009/07/28 15:28:24 drochner Exp $ */
+/* $NetBSD: gpiosim.c,v 1.5 2009/08/06 13:16:49 mbalmer Exp $ */
/* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */
/*
@@ -153,6 +153,7 @@
struct gpiosim_softc *sc = device_private(self);
struct sysctlnode node;
+ pmf_device_deregister(self);
if (sc-sc_node != NULL) {
node = *sc-sc_node;
sysctl_destroyv(node, CTL_EOL);
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Thu Aug 6 15:58:13 UTC 2009
Modified Files:
src/sys/arch/mips/mips: mips_machdep.c
Log Message:
Make cidnames const
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/sys/arch/mips/mips/mips_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/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.212 src/sys/arch/mips/mips/mips_machdep.c:1.213
--- src/sys/arch/mips/mips/mips_machdep.c:1.212 Thu Aug 6 00:46:34 2009
+++ src/sys/arch/mips/mips/mips_machdep.c Thu Aug 6 15:58:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.212 2009/08/06 00:46:34 matt Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.213 2009/08/06 15:58:12 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.212 2009/08/06 00:46:34 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.213 2009/08/06 15:58:12 matt Exp $);
#include opt_cputype.h
@@ -449,7 +449,7 @@
* Company ID's are not sparse (yet), this array is indexed directly
* by pridtab-cpu_cid.
*/
-static const char *cidnames[] = {
+static const char * const cidnames[] = {
Prehistoric,
MIPS, /* or MIPS Technologies, Inc. */
Broadcom, /* or Broadcom Corp. */
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Aug 6 15:58:46 UTC 2009 Modified Files: src/sys/arch/mips/mips: cache.c Log Message: The Loongson2 secondary cache is unified. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mips/mips/cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/cache.c diff -u src/sys/arch/mips/mips/cache.c:1.34 src/sys/arch/mips/mips/cache.c:1.35 --- src/sys/arch/mips/mips/cache.c:1.34 Thu Aug 6 01:27:47 2009 +++ src/sys/arch/mips/mips/cache.c Thu Aug 6 15:58:46 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.34 2009/08/06 01:27:47 matt Exp $ */ +/* $NetBSD: cache.c,v 1.35 2009/08/06 15:58:46 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.34 2009/08/06 01:27:47 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.35 2009/08/06 15:58:46 matt Exp $); #include opt_cputype.h #include opt_mips_cache.h @@ -833,6 +833,7 @@ mips_sdcache_ways = 4; mips_sdcache_size = 512*1024; mips_sdcache_line_size = 32; + mips_scache_unified = 1; mips_cache_ops.mco_sdcache_wbinv_all = r4k_sdcache_wbinv_all_32;
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Thu Aug 6 16:13:08 UTC 2009 Modified Files: src/sys/arch/evbmips/conf: GDIUM std.gdium src/sys/arch/mips/conf: files.mips src/sys/arch/mips/mips: cache.c Log Message: Change MIPS64_LOONGSON2 to MIP3_LOONGSON2 since it's a MIPS3 and not MIPS64. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/GDIUM \ src/sys/arch/evbmips/conf/std.gdium cvs rdiff -u -r1.60 -r1.61 src/sys/arch/mips/conf/files.mips cvs rdiff -u -r1.35 -r1.36 src/sys/arch/mips/mips/cache.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/conf/GDIUM diff -u src/sys/arch/evbmips/conf/GDIUM:1.1 src/sys/arch/evbmips/conf/GDIUM:1.2 --- src/sys/arch/evbmips/conf/GDIUM:1.1 Thu Aug 6 00:50:25 2009 +++ src/sys/arch/evbmips/conf/GDIUM Thu Aug 6 16:13:07 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GDIUM,v 1.1 2009/08/06 00:50:25 matt Exp $ +# $NetBSD: GDIUM,v 1.2 2009/08/06 16:13:07 matt Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GLIB1K-$Revision: 1.1 $ +#ident GDIUM-$Revision: 1.2 $ maxusers 16 Index: src/sys/arch/evbmips/conf/std.gdium diff -u src/sys/arch/evbmips/conf/std.gdium:1.1 src/sys/arch/evbmips/conf/std.gdium:1.2 --- src/sys/arch/evbmips/conf/std.gdium:1.1 Thu Aug 6 00:50:25 2009 +++ src/sys/arch/evbmips/conf/std.gdium Thu Aug 6 16:13:07 2009 @@ -1,4 +1,4 @@ -# $NetBSD: std.gdium,v 1.1 2009/08/06 00:50:25 matt Exp $ +# $NetBSD: std.gdium,v 1.2 2009/08/06 16:13:07 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -6,7 +6,7 @@ options MIPS3_ENABLE_CLOCK_INTR # Platform support -options MIPS64_LOONGSON2 +options MIPS3_LOONGSON2 options MIPS3 options EXEC_ELF32 # exec ELF32 binaries Index: src/sys/arch/mips/conf/files.mips diff -u src/sys/arch/mips/conf/files.mips:1.60 src/sys/arch/mips/conf/files.mips:1.61 --- src/sys/arch/mips/conf/files.mips:1.60 Sat Aug 1 22:59:52 2009 +++ src/sys/arch/mips/conf/files.mips Thu Aug 6 16:13:08 2009 @@ -1,9 +1,9 @@ -# $NetBSD: files.mips,v 1.60 2009/08/01 22:59:52 matt Exp $ +# $NetBSD: files.mips,v 1.61 2009/08/06 16:13:08 matt Exp $ # defflag opt_cputype.h NOFPU MIPS64_SB1 -MIPS64_LOONGSON2F +MIPS3_LOONGSON2F # and the rest... # MIPS1 MIPS2 MIPS3 MIPS4 MIPS5 # MIPS32 MIPS64 Index: src/sys/arch/mips/mips/cache.c diff -u src/sys/arch/mips/mips/cache.c:1.35 src/sys/arch/mips/mips/cache.c:1.36 --- src/sys/arch/mips/mips/cache.c:1.35 Thu Aug 6 15:58:46 2009 +++ src/sys/arch/mips/mips/cache.c Thu Aug 6 16:13:08 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.35 2009/08/06 15:58:46 matt Exp $ */ +/* $NetBSD: cache.c,v 1.36 2009/08/06 16:13:08 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.35 2009/08/06 15:58:46 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.36 2009/08/06 16:13:08 matt Exp $); #include opt_cputype.h #include opt_mips_cache.h @@ -651,8 +651,7 @@ r10k_pdcache_wb_range; break; #endif /* ENABLE_MIPS4_CACHE_R10K */ -#endif /* MIPS3 || MIPS4 */ -#ifdef MIPS64_LOONGSON2 +#ifdef MIPS3_LOONGSON2 case MIPS_LOONGSON2: mips_picache_ways = 4; mips_pdcache_ways = 4; @@ -684,6 +683,7 @@ /* Virtually-indexed cache; no use for colors. */ break; #endif +#endif /* MIPS3 || MIPS4 */ default: panic(can't handle primary cache on impl 0x%x, MIPS_PRID_IMPL(cpu_id)); @@ -827,8 +827,7 @@ r10k_sdcache_wb_range; break; #endif /* ENABLE_MIPS4_CACHE_R10K */ -#endif /* MIPS3 || MIPS4 */ -#ifdef MIPS64_LOONGSON2 +#ifdef MIPS3_LOONGSON2 case MIPS_LOONGSON2: mips_sdcache_ways = 4; mips_sdcache_size = 512*1024; @@ -847,6 +846,7 @@ r4k_sdcache_wb_range_32; break; #endif +#endif /* MIPS3 || MIPS4 */ default: panic(can't handle secondary cache on impl 0x%x,
CVS commit: src/sys/arch/evbmips/gdium
Module Name:src
Committed By: matt
Date: Thu Aug 6 16:37:01 UTC 2009
Modified Files:
src/sys/arch/evbmips/gdium: gdium_dma.c gdium_genfb.c machdep.c
mainbus.c
Log Message:
Cleanup a bit and remove some debugging cruft that's no longer needed now
that the early console is working.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/gdium/gdium_dma.c \
src/sys/arch/evbmips/gdium/gdium_genfb.c \
src/sys/arch/evbmips/gdium/machdep.c src/sys/arch/evbmips/gdium/mainbus.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_dma.c
diff -u src/sys/arch/evbmips/gdium/gdium_dma.c:1.1 src/sys/arch/evbmips/gdium/gdium_dma.c:1.2
--- src/sys/arch/evbmips/gdium/gdium_dma.c:1.1 Thu Aug 6 00:50:26 2009
+++ src/sys/arch/evbmips/gdium/gdium_dma.c Thu Aug 6 16:37:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_dma.c,v 1.1 2009/08/06 00:50:26 matt Exp $ */
+/* $NetBSD: gdium_dma.c,v 1.2 2009/08/06 16:37:01 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gdium_dma.c,v 1.1 2009/08/06 00:50:26 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: gdium_dma.c,v 1.2 2009/08/06 16:37:01 matt Exp $);
#include sys/param.h
@@ -45,15 +45,15 @@
#include evbmips/gdium/gdiumvar.h
void
-gdium_dma_init(struct gdium_config *acp)
+gdium_dma_init(struct gdium_config *gc)
{
bus_dma_tag_t t;
/*
* Initialize the DMA tag used for PCI DMA.
*/
- t = acp-gc_pci_dmat;
- t-_cookie = acp;
+ t = gc-gc_pci_dmat;
+ t-_cookie = gc;
t-_wbase = GDIUM_DMA_PCI_PCIBASE;
t-_physbase = GDIUM_DMA_PCI_PHYSBASE;
t-_wsize = GDIUM_DMA_PCI_SIZE;
Index: src/sys/arch/evbmips/gdium/gdium_genfb.c
diff -u src/sys/arch/evbmips/gdium/gdium_genfb.c:1.1 src/sys/arch/evbmips/gdium/gdium_genfb.c:1.2
--- src/sys/arch/evbmips/gdium/gdium_genfb.c:1.1 Thu Aug 6 00:50:26 2009
+++ src/sys/arch/evbmips/gdium/gdium_genfb.c Thu Aug 6 16:37:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_genfb.c,v 1.1 2009/08/06 00:50:26 matt Exp $ */
+/* $NetBSD: gdium_genfb.c,v 1.2 2009/08/06 16:37:01 matt 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.1 2009/08/06 00:50:26 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: gdium_genfb.c,v 1.2 2009/08/06 16:37:01 matt Exp $);
#include sys/param.h
#include sys/buf.h
@@ -86,6 +86,8 @@
ri-ri_bits = (char *)MIPS_PHYS_TO_KSEG1(BONITO_PCILO_BASE + reg);
ri-ri_flg = RI_CENTER | RI_FULLCLEAR;
+ memset(ri-ri_bits, 0, 0x20);
+
/* use as much of the screen as the font permits */
rasops_init(ri, 30, 80);
@@ -97,7 +99,7 @@
gdium_stdscreen.textops = ri-ri_ops;
gdium_stdscreen.capabilities = ri-ri_caps;
- ri-ri_ops.allocattr(ri, 0, 0, 0, defattr);
+ ri-ri_ops.allocattr(ri, 0, ri-ri_rows - 1, 0, defattr);
wsdisplay_preattach(gdium_stdscreen, ri, 0, 0, defattr);
@@ -105,7 +107,7 @@
}
#else /* NWSDISPLAY 0 */
int
-gdium_cnattach(void)
+gdium_cnattach(struct gdium_config *gc)
{
return -1;
}
Index: src/sys/arch/evbmips/gdium/machdep.c
diff -u src/sys/arch/evbmips/gdium/machdep.c:1.1 src/sys/arch/evbmips/gdium/machdep.c:1.2
--- src/sys/arch/evbmips/gdium/machdep.c:1.1 Thu Aug 6 00:50:26 2009
+++ src/sys/arch/evbmips/gdium/machdep.c Thu Aug 6 16:37:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1 2009/08/06 00:50:26 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.2 2009/08/06 16:37:01 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1 2009/08/06 00:50:26 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.2 2009/08/06 16:37:01 matt Exp $);
#include opt_ddb.h
#include opt_execfmt.h
@@ -179,7 +179,7 @@
int mem_cluster_cnt;
void configure(void);
-void mach_init(int, char **);
+void mach_init(int, char **, char **, void *);
/*
* safepri is a safe priority for sleep to set for a spin-wait during
@@ -193,7 +193,7 @@
* Do all the stuff that locore normally does before calling main().
*/
void
-mach_init(int argc, char **argv)
+mach_init(int argc, char **argv, char **evnp, void *syms)
{
struct gdium_config *gc = gdium_configuration;
void *kernend, *v;
@@ -201,18 +201,15 @@
char *cp;
int freqok, i, howto;
psize_t memsize;
-#define FBADDR(y, x) (void*)(0xb400 + 2*x + 0x800*y)
extern char edata[], end[];
- memset(FBADDR(100,480), 0xff, 128);
/*
* Clear the BSS segment.
*/
kernend = (void *)mips_round_page(end);
memset(edata, 0, (char *)kernend - edata);
- memset(FBADDR(104,480), 0xff, 128);
/*
* Set up the exception vectors and CPU-specific function
* vectors early on. We need the wbflush() vector set up
@@ -222,23 +219,17 @@
*/
mips_vector_init();
-
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu Aug 6 16:55:32 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4128 Log Message: Import pkg_install-20090806: - pkg_add: add support to check license conditions before installation - pkg_delete: add -k option to skip over preserve packages. - WARNS=4 clean, fix some potential uses of uninitialized variables Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090806 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/libexec/lfs_cleanerd
Module Name:src Committed By: wiz Date: Thu Aug 6 21:18:54 UTC 2009 Modified Files: src/libexec/lfs_cleanerd: lfs_cleanerd.8 Log Message: Describe -D. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/libexec/lfs_cleanerd/lfs_cleanerd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/lfs_cleanerd/lfs_cleanerd.8 diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.8:1.17 src/libexec/lfs_cleanerd/lfs_cleanerd.8:1.18 --- src/libexec/lfs_cleanerd/lfs_cleanerd.8:1.17 Sat Dec 23 07:21:34 2006 +++ src/libexec/lfs_cleanerd/lfs_cleanerd.8 Thu Aug 6 21:18:54 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: lfs_cleanerd.8,v 1.17 2006/12/23 07:21:34 wiz Exp $ +.\ $NetBSD: lfs_cleanerd.8,v 1.18 2009/08/06 21:18:54 wiz Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ from: @(#)lfs_cleanerd.8 8.2 (Berkeley) 12/11/93 .\ -.Dd November 18, 2006 +.Dd August 6, 2009 .Dt LFS_CLEANERD 8 .Os .Sh NAME @@ -37,7 +37,7 @@ .Nd garbage collect a log-structured file system .Sh SYNOPSIS .Nm -.Op Fl bcdfmqs +.Op Fl bcDdfmqs .Op Fl i Ar segment-number .Op Fl l Ar load-threshhold .Op Fl n Ar number-of-segments @@ -75,6 +75,10 @@ blocks that are not contiguous, and if it does, rewrite it. After a single pass through the filesystem the cleaner will exit. This option has been reported to corrupt file data; do not use it. +.It Fl D +Stay in the foreground, do not become a daemon process. +Does not print additional debugging information (in contrast to +.Fl d ) . .It Fl d Run in debug mode. Do not become a daemon process, and print debugging information. @@ -94,7 +98,8 @@ Clean more aggressively when the system load is below the given threshhold. The default threshhold is 0.2. .It Fl m -Does nothing. This option is present for historical compatibility. +Does nothing. +This option is present for historical compatibility. .It Fl n Ar number-of-segments Clean this number of segments at a time: that is, pass this many segments' blocks through a single call to lfs_markv, or, if
CVS commit: src/sys/kern
Module Name:src Committed By: dsl Date: Thu Aug 6 21:33:54 UTC 2009 Modified Files: src/sys/kern: kern_exec.c Log Message: ktrace the arguments to script interpreters that come from the script. Fixes PR/33021 To generate a diff of this commit: cvs rdiff -u -r1.289 -r1.290 src/sys/kern/kern_exec.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_exec.c diff -u src/sys/kern/kern_exec.c:1.289 src/sys/kern/kern_exec.c:1.290 --- src/sys/kern/kern_exec.c:1.289 Tue Jun 2 23:21:38 2009 +++ src/sys/kern/kern_exec.c Thu Aug 6 21:33:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.289 2009/06/02 23:21:38 pooka Exp $ */ +/* $NetBSD: kern_exec.c,v 1.290 2009/08/06 21:33:54 dsl Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.289 2009/06/02 23:21:38 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.290 2009/08/06 21:33:54 dsl Exp $); #include opt_ktrace.h #include opt_modular.h @@ -620,6 +620,7 @@ while (*cp) *dp++ = *cp++; *dp++ = '\0'; + ktrexecarg(tmpfap-fa_arg, cp - tmpfap-fa_arg); kmem_free(tmpfap-fa_arg, tmpfap-fa_len); tmpfap++; argc++;
CVS commit: src/usr.sbin/wake
Module Name:src Committed By: wiz Date: Thu Aug 6 22:01:36 UTC 2009 Modified Files: src/usr.sbin/wake: wake.8 Log Message: Improve wording, based on suggestions by Jukka Ruohonen in private mail. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/wake/wake.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/wake/wake.8 diff -u src/usr.sbin/wake/wake.8:1.2 src/usr.sbin/wake/wake.8:1.3 --- src/usr.sbin/wake/wake.8:1.2 Fri Jun 26 09:25:39 2009 +++ src/usr.sbin/wake/wake.8 Thu Aug 6 22:01:36 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: wake.8,v 1.2 2009/06/26 09:25:39 wiz Exp $ +.\ $NetBSD: wake.8,v 1.3 2009/08/06 22:01:36 wiz Exp $ .\ .\ Copyright (c) 2009 Marc Balmer m...@msys.ch .\ @@ -37,14 +37,16 @@ .Ar interface is the network interface of the local machine. .Ar lladdr -are the link layer addresses of the remote machines -and can be specified as the actual hardware address +is the link layer address of the remote machine. +This can be specified as the actual hardware address (six hexadecimal numbers separated by colons) -or a hostname entry in +or as a hostname entry in .Pa /etc/ethers . -Link layer addresses can be determined and set on -.Nx -machines using +.Nm +accepts multiple +.Ar lladdr +addresses. +Link layer addresses can be determined and set using .Xr ifconfig 8 . .Sh FILES .Bl -tag -width /etc/ethers -compact
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Aug 6 22:56:31 UTC 2009 Modified Files: src/sys/arch/mips/mips: cache.c Log Message: Update Loongston. Set colors and mark it as having virtual aliases. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/mips/mips/cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/cache.c diff -u src/sys/arch/mips/mips/cache.c:1.36 src/sys/arch/mips/mips/cache.c:1.37 --- src/sys/arch/mips/mips/cache.c:1.36 Thu Aug 6 16:13:08 2009 +++ src/sys/arch/mips/mips/cache.c Thu Aug 6 22:56:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.36 2009/08/06 16:13:08 matt Exp $ */ +/* $NetBSD: cache.c,v 1.37 2009/08/06 22:56:31 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.36 2009/08/06 16:13:08 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.37 2009/08/06 22:56:31 matt Exp $); #include opt_cputype.h #include opt_mips_cache.h @@ -662,6 +662,8 @@ mips_picache_line_size = 32; mips_pdcache_line_size = 32; + mips_cache_virtual_alias = 1; + mips_cache_ops.mco_icache_sync_all = r4k_icache_sync_all_32; mips_cache_ops.mco_icache_sync_range = @@ -680,7 +682,11 @@ mips_cache_ops.mco_pdcache_wb_range = r4k_pdcache_wb_range_32; - /* Virtually-indexed cache; no use for colors. */ + /* + * For current version chips, [the] operating system is + * obliged to eliminate the potential for virtual aliasing. + */ + uvmexp.ncolors = atop(mips_pdcache_size) / mips_pdcache_ways; break; #endif #endif /* MIPS3 || MIPS4 */ @@ -844,6 +850,10 @@ r4k_sdcache_inv_range_32; mips_cache_ops.mco_sdcache_wb_range = r4k_sdcache_wb_range_32; + + /* + * The secondary cache is physically indexed and tagged + */ break; #endif #endif /* MIPS3 || MIPS4 */
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Aug 6 23:16:39 UTC 2009 Modified Files: src/sys/arch/mips/mips: cache.c Log Message: Use mips3_get_cache_config for Loongson2 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/mips/mips/cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/cache.c diff -u src/sys/arch/mips/mips/cache.c:1.37 src/sys/arch/mips/mips/cache.c:1.38 --- src/sys/arch/mips/mips/cache.c:1.37 Thu Aug 6 22:56:31 2009 +++ src/sys/arch/mips/mips/cache.c Thu Aug 6 23:16:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.37 2009/08/06 22:56:31 matt Exp $ */ +/* $NetBSD: cache.c,v 1.38 2009/08/06 23:16:39 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.37 2009/08/06 22:56:31 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.38 2009/08/06 23:16:39 matt Exp $); #include opt_cputype.h #include opt_mips_cache.h @@ -656,11 +656,7 @@ mips_picache_ways = 4; mips_pdcache_ways = 4; - mips_picache_size = 64*1024; - mips_pdcache_size = 64*1024; - - mips_picache_line_size = 32; - mips_pdcache_line_size = 32; + mips3_get_cache_config(csizebase); mips_cache_virtual_alias = 1;
CVS commit: src/sys/dev
Module Name:src Committed By: dyoung Date: Fri Aug 7 00:07:39 UTC 2009 Modified Files: src/sys/dev: dkvar.h Log Message: Put the entire expression that DK_BUSY() evaluates to in parentheses for safety. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dkvar.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/dkvar.h diff -u src/sys/dev/dkvar.h:1.13 src/sys/dev/dkvar.h:1.14 --- src/sys/dev/dkvar.h:1.13 Mon Apr 28 20:23:46 2008 +++ src/sys/dev/dkvar.h Fri Aug 7 00:07:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dkvar.h,v 1.13 2008/04/28 20:23:46 martin Exp $ */ +/* $NetBSD: dkvar.h,v 1.14 2009/08/07 00:07:39 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -85,9 +85,9 @@ }; #define DK_BUSY(_dksc, _pmask)\ - ((_dksc)-sc_dkdev.dk_openmask ~(_pmask)) || \ + (((_dksc)-sc_dkdev.dk_openmask ~(_pmask)) || \ ((_dksc)-sc_dkdev.dk_bopenmask (_pmask) \ - ((_dksc)-sc_dkdev.dk_copenmask (_pmask))) + ((_dksc)-sc_dkdev.dk_copenmask (_pmask /* * Functions that are exported to the pseudo disk implementations:
CVS commit: src/sys/dev
Module Name:src
Committed By: dyoung
Date: Fri Aug 7 00:08:07 UTC 2009
Modified Files:
src/sys/dev: vnd.c
Log Message:
Re-use DK_BUSY().
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/dev/vnd.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.203 src/sys/dev/vnd.c:1.204
--- src/sys/dev/vnd.c:1.203 Tue Jul 7 19:51:22 2009
+++ src/sys/dev/vnd.c Fri Aug 7 00:08:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.203 2009/07/07 19:51:22 dyoung Exp $ */
+/* $NetBSD: vnd.c,v 1.204 2009/08/07 00:08:07 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.203 2009/07/07 19:51:22 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: vnd.c,v 1.204 2009/08/07 00:08:07 dyoung Exp $);
#if defined(_KERNEL_OPT)
#include fs_nfs.h
@@ -163,6 +163,7 @@
#include miscfs/genfs/genfs.h
#include miscfs/specfs/specdev.h
+#include dev/dkvar.h
#include dev/vndvar.h
#include prop/proplib.h
@@ -972,9 +973,7 @@
* or if both the character and block flavors of this
* partition are open.
*/
- if (((vnd-sc_dkdev.dk_openmask ~pmask) ||
- ((vnd-sc_dkdev.dk_bopenmask pmask)
- (vnd-sc_dkdev.dk_copenmask pmask))) !force) {
+ if (DK_BUSY(vnd, pmask) !force) {
vndunlock(vnd);
return EBUSY;
}
CVS commit: src/sys/arch/evbmips/gdium
Module Name:src
Committed By: matt
Date: Fri Aug 7 00:11:08 UTC 2009
Modified Files:
src/sys/arch/evbmips/gdium: machdep.c
Log Message:
Get the CPU frequency from the PMON environment (which it provided to us).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/gdium/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/evbmips/gdium/machdep.c
diff -u src/sys/arch/evbmips/gdium/machdep.c:1.2 src/sys/arch/evbmips/gdium/machdep.c:1.3
--- src/sys/arch/evbmips/gdium/machdep.c:1.2 Thu Aug 6 16:37:01 2009
+++ src/sys/arch/evbmips/gdium/machdep.c Fri Aug 7 00:11:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.2 2009/08/06 16:37:01 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.3 2009/08/07 00:11:08 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.2 2009/08/06 16:37:01 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.3 2009/08/07 00:11:08 matt Exp $);
#include opt_ddb.h
#include opt_execfmt.h
@@ -193,13 +193,13 @@
* Do all the stuff that locore normally does before calling main().
*/
void
-mach_init(int argc, char **argv, char **evnp, void *syms)
+mach_init(int argc, char **argv, char **envp, void *callvec)
{
struct gdium_config *gc = gdium_configuration;
void *kernend, *v;
u_long first, last;
char *cp;
- int freqok, i, howto;
+ int i, howto;
psize_t memsize;
extern char edata[], end[];
@@ -232,16 +232,38 @@
gdium_cnattach(gc);
/*
- * Calibrate the timer if YAMON failed to tell us.
+ * Get the timer from PMON.
*/
- if (!freqok) {
-#if 0
- bus_space_handle_t sh;
- bus_space_map(gc-gc_iot, MALTA_RTCADR, 2, 0, sh);
- malta_cal_timer(gc-gc_iot, sh);
- bus_space_unmap(gc-gc_iot, sh, 2);
-#endif
+ for (i = 0; envp[i] != NULL; i++) {
+ if (!strncmp(envp[i], cpuclock=, 9)) {
+ curcpu()-ci_cpu_freq =
+ strtoul(envp[i][9], NULL, 10);
+ break;
+ }
}
+
+ if (mips_cpu_flags CPU_MIPS_DOUBLE_COUNT)
+ curcpu()-ci_cpu_freq /= 2;
+
+ /* Compute the number of ticks for hz. */
+ curcpu()-ci_cycles_per_hz = (curcpu()-ci_cpu_freq + hz / 2) / hz;
+
+ /* Compute the delay divisor. */
+ curcpu()-ci_divisor_delay =
+ ((curcpu()-ci_cpu_freq + 50) / 100);
+
+ /*
+ * Get correct cpu frequency if the CPU runs at twice the
+ * external/cp0-count frequency.
+ */
+ if (mips_cpu_flags CPU_MIPS_DOUBLE_COUNT)
+ curcpu()-ci_cpu_freq *= 2;
+
+#ifdef DEBUG
+ printf(Timer calibration: %lu cycles/sec\n,
+ curcpu()-ci_cpu_freq);
+ delay(100);
+#endif
#if NCOM 0
/*
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Fri Aug 7 01:14:27 UTC 2009
Modified Files:
src/sys/arch/mips/mips: mips3_clockintr.c
Log Message:
attach the missed evcnt too
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/mips/mips3_clockintr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips3_clockintr.c
diff -u src/sys/arch/mips/mips/mips3_clockintr.c:1.8 src/sys/arch/mips/mips/mips3_clockintr.c:1.9
--- src/sys/arch/mips/mips/mips3_clockintr.c:1.8 Sun Aug 3 09:14:28 2008
+++ src/sys/arch/mips/mips/mips3_clockintr.c Fri Aug 7 01:14:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips3_clockintr.c,v 1.8 2008/08/03 09:14:28 tsutsui Exp $ */
+/* $NetBSD: mips3_clockintr.c,v 1.9 2009/08/07 01:14:26 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -78,7 +78,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mips3_clockintr.c,v 1.8 2008/08/03 09:14:28 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips3_clockintr.c,v 1.9 2009/08/07 01:14:26 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -141,6 +141,7 @@
mips3_initclocks(void)
{
evcnt_attach_static(mips_int5_evcnt);
+ evcnt_attach_static(mips_int5_missed_evcnt);
next_cp0_clk_intr = mips3_cp0_count_read() + curcpu()-ci_cycles_per_hz;
mips3_cp0_compare_write(next_cp0_clk_intr);
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Fri Aug 7 01:26:13 UTC 2009
Modified Files:
src/sys/arch/mips/mips: softintr.c
Log Message:
Fix references to mips_ipl_si_to_sr which were off by 1.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/mips/softintr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/softintr.c
diff -u src/sys/arch/mips/mips/softintr.c:1.7 src/sys/arch/mips/mips/softintr.c:1.8
--- src/sys/arch/mips/mips/softintr.c:1.7 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mips/mips/softintr.c Fri Aug 7 01:26:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: softintr.c,v 1.7 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: softintr.c,v 1.8 2009/08/07 01:26:13 matt Exp $ */
/*
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: softintr.c,v 1.7 2008/04/28 20:23:28 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: softintr.c,v 1.8 2009/08/07 01:26:13 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -43,16 +43,16 @@
switch (level) {
case SOFTINT_BIO:
- *machdep = mips_ipl_si_to_sr[IPL_SOFTBIO];
+ *machdep = mips_ipl_si_to_sr[IPL_SOFTBIO-IPL_SOFTCLOCK];
break;
case SOFTINT_NET:
- *machdep = mips_ipl_si_to_sr[IPL_SOFTNET];
+ *machdep = mips_ipl_si_to_sr[IPL_SOFTNET-IPL_SOFTCLOCK];
break;
case SOFTINT_SERIAL:
- *machdep = mips_ipl_si_to_sr[IPL_SOFTSERIAL];
+ *machdep = mips_ipl_si_to_sr[IPL_SOFTSERIAL-IPL_SOFTCLOCK];
break;
case SOFTINT_CLOCK:
- *machdep = mips_ipl_si_to_sr[IPL_SOFTCLOCK];
+ *machdep = mips_ipl_si_to_sr[IPL_SOFTCLOCK-IPL_SOFTCLOCK];
break;
default:
panic(softint_init_md);
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Fri Aug 7 03:33:28 UTC 2009
Modified Files:
src/sys/arch/mips/mips: mips_machdep.c
Log Message:
Mark LOONGSON as uncached for the moment.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/arch/mips/mips/mips_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/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.213 src/sys/arch/mips/mips/mips_machdep.c:1.214
--- src/sys/arch/mips/mips/mips_machdep.c:1.213 Thu Aug 6 15:58:12 2009
+++ src/sys/arch/mips/mips/mips_machdep.c Fri Aug 7 03:33:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.213 2009/08/06 15:58:12 matt Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.214 2009/08/07 03:33:28 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.213 2009/08/06 15:58:12 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.214 2009/08/07 03:33:28 matt Exp $);
#include opt_cputype.h
@@ -367,10 +367,12 @@
* ICT Loongson2 is a MIPS64 CPU with a few quirks.
*/
{ 0, MIPS_LOONGSON2, MIPS_REV_LOONGSON2E, -1, CPU_ARCH_MIPS3, 64,
- CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT,
+ CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT |
+ CPU_MIPS_HAVE_SPECIAL_CCA | (2 CPU_MIPS_CACHED_CCA_SHIFT),
ICT Loongson 2E CPU },
{ 0, MIPS_LOONGSON2, MIPS_REV_LOONGSON2F, -1, CPU_ARCH_MIPS3, 64,
- CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT,
+ CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT |
+ CPU_MIPS_HAVE_SPECIAL_CCA | (2 CPU_MIPS_CACHED_CCA_SHIFT),
ICT Loongson 2F CPU },
#if 0 /* ID collisions : can we use a CU1 test or similar? */
CVS commit: [netbsd-5-0] src/sys/ufs/ufs
Module Name:src Committed By: snj Date: Fri Aug 7 05:57:54 UTC 2009 Modified Files: src/sys/ufs/ufs [netbsd-5-0]: ufs_quota.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #898): sys/ufs/ufs/ufs_quota.c: revision 1.64 Fix previous: mutex_destroy() the right mutex To generate a diff of this commit: cvs rdiff -u -r1.60.10.1.2.1 -r1.60.10.1.2.2 src/sys/ufs/ufs/ufs_quota.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/ufs/ufs_quota.c diff -u src/sys/ufs/ufs/ufs_quota.c:1.60.10.1.2.1 src/sys/ufs/ufs/ufs_quota.c:1.60.10.1.2.2 --- src/sys/ufs/ufs/ufs_quota.c:1.60.10.1.2.1 Fri Aug 7 05:57:06 2009 +++ src/sys/ufs/ufs/ufs_quota.c Fri Aug 7 05:57:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota.c,v 1.60.10.1.2.1 2009/08/07 05:57:06 snj Exp $ */ +/* $NetBSD: ufs_quota.c,v 1.60.10.1.2.2 2009/08/07 05:57:54 snj Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.60.10.1.2.1 2009/08/07 05:57:06 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.60.10.1.2.2 2009/08/07 05:57:54 snj Exp $); #include sys/param.h #include sys/kernel.h @@ -887,7 +887,7 @@ KASSERT(dq-dq_cnt 0); dqref(dq); mutex_exit(dqlock); - mutex_destroy(dq-dq_interlock); + mutex_destroy(ndq-dq_interlock); pool_cache_put(dquot_cache, ndq); *dqp = dq; return 0;
CVS commit: [netbsd-5] src/sys/ufs/ufs
Module Name:src Committed By: snj Date: Fri Aug 7 05:59:17 UTC 2009 Modified Files: src/sys/ufs/ufs [netbsd-5]: ufs_quota.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #898): sys/ufs/ufs/ufs_quota.c: revision 1.63 Add missing mutex_destroy() before pool_cache_put(). Prevents a Mutex error: lockdebug_alloc: already initialized panic. To generate a diff of this commit: cvs rdiff -u -r1.60.10.1 -r1.60.10.2 src/sys/ufs/ufs/ufs_quota.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/ufs/ufs_quota.c diff -u src/sys/ufs/ufs/ufs_quota.c:1.60.10.1 src/sys/ufs/ufs/ufs_quota.c:1.60.10.2 --- src/sys/ufs/ufs/ufs_quota.c:1.60.10.1 Mon Feb 2 18:24:17 2009 +++ src/sys/ufs/ufs/ufs_quota.c Fri Aug 7 05:59:17 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota.c,v 1.60.10.1 2009/02/02 18:24:17 snj Exp $ */ +/* $NetBSD: ufs_quota.c,v 1.60.10.2 2009/08/07 05:59:17 snj Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.60.10.1 2009/02/02 18:24:17 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.60.10.2 2009/08/07 05:59:17 snj Exp $); #include sys/param.h #include sys/kernel.h @@ -887,6 +887,7 @@ KASSERT(dq-dq_cnt 0); dqref(dq); mutex_exit(dqlock); + mutex_destroy(dq-dq_interlock); pool_cache_put(dquot_cache, ndq); *dqp = dq; return 0;
CVS commit: [netbsd-5] src/sys/ufs/ufs
Module Name:src Committed By: snj Date: Fri Aug 7 05:59:44 UTC 2009 Modified Files: src/sys/ufs/ufs [netbsd-5]: ufs_quota.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #898): sys/ufs/ufs/ufs_quota.c: revision 1.64 Fix previous: mutex_destroy() the right mutex To generate a diff of this commit: cvs rdiff -u -r1.60.10.2 -r1.60.10.3 src/sys/ufs/ufs/ufs_quota.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/ufs/ufs_quota.c diff -u src/sys/ufs/ufs/ufs_quota.c:1.60.10.2 src/sys/ufs/ufs/ufs_quota.c:1.60.10.3 --- src/sys/ufs/ufs/ufs_quota.c:1.60.10.2 Fri Aug 7 05:59:17 2009 +++ src/sys/ufs/ufs/ufs_quota.c Fri Aug 7 05:59:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_quota.c,v 1.60.10.2 2009/08/07 05:59:17 snj Exp $ */ +/* $NetBSD: ufs_quota.c,v 1.60.10.3 2009/08/07 05:59:44 snj Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.60.10.2 2009/08/07 05:59:17 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_quota.c,v 1.60.10.3 2009/08/07 05:59:44 snj Exp $); #include sys/param.h #include sys/kernel.h @@ -887,7 +887,7 @@ KASSERT(dq-dq_cnt 0); dqref(dq); mutex_exit(dqlock); - mutex_destroy(dq-dq_interlock); + mutex_destroy(ndq-dq_interlock); pool_cache_put(dquot_cache, ndq); *dqp = dq; return 0;
