CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: gsutre Date: Wed Sep 21 08:57:12 UTC 2011 Modified Files: src/sys/arch/i386/stand/lib: biosdisk.c Log Message: Fix btinfo_bootdisk's labelsector and btinfo_bootwedge's startblk for the non-GPT case. ok jakllsch@ To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/lib/biosdisk.c diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.38 src/sys/arch/i386/stand/lib/biosdisk.c:1.39 --- src/sys/arch/i386/stand/lib/biosdisk.c:1.38 Sun Jul 17 20:54:41 2011 +++ src/sys/arch/i386/stand/lib/biosdisk.c Wed Sep 21 08:57:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: biosdisk.c,v 1.38 2011/07/17 20:54:41 joerg Exp $ */ +/* $NetBSD: biosdisk.c,v 1.39 2011/09/21 08:57:12 gsutre Exp $ */ /* * Copyright (c) 1996, 1998 @@ -389,12 +389,12 @@ ingest_label(d, lp); #ifdef _STANDALONE - bi_disk.labelsector = d-boff + LABELSECTOR; + bi_disk.labelsector = sector + LABELSECTOR; bi_disk.label.type = lp-d_type; memcpy(bi_disk.label.packname, lp-d_packname, 16); bi_disk.label.checksum = lp-d_checksum; - bi_wedge.matchblk = d-boff + LABELSECTOR; + bi_wedge.matchblk = sector + LABELSECTOR; bi_wedge.matchnblks = 1; md5(bi_wedge.matchhash, d-buf, d-ll.secsize);
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: ahoka Date: Wed Sep 21 10:18:52 UTC 2011 Added Files: src/sys/arch/i386/conf: MODULAR Log Message: Initial version of a pro-module kernel config To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/i386/conf/MODULAR diff -u /dev/null src/sys/arch/i386/conf/MODULAR:1.1 --- /dev/null Wed Sep 21 10:18:52 2011 +++ src/sys/arch/i386/conf/MODULAR Wed Sep 21 10:18:52 2011 @@ -0,0 +1,77 @@ +# $NetBSD: MODULAR,v 1.1 2011/09/21 10:18:52 ahoka Exp $ +# +# MODULAR kernel +# This kernel config prefers loading kernel drivers from file system. +# Please see module(7) for more information. +# +include arch/i386/conf/GENERIC + +# these features are available as modules +# +no options P1003_1B_SEMAPHORE # p1003.1b semaphore support +no options AIO # POSIX asynchronous I/O, built as a module +no options MQUEUE # POSIX messsage queues, built as a module +no options NFSSERVER # Network File System server + +# compatibility options, built as modules +# +no options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility +no options COMPAT_SVR4 # binary compatibility with SVR4 +no options COMPAT_IBCS2 # binary compatibility with SCO and ISC +no options COMPAT_LINUX # binary compatibility with Linux +no options COMPAT_FREEBSD # binary compatibility with FreeBSD + +# build non boot critical file systems as modules +# +no file-system EXT2FS # second extended file system (linux) +no file-system LFS # log-structured file system +no file-system NTFS # Windows/NT file system (experimental) +no file-system MSDOSFS # MS-DOS file system +no file-system KERNFS # /kern +no file-system OVERLAY # overlay file system +no file-system PROCFS # /proc +no file-system PUFFS # Userspace file systems (e.g. ntfs-3g sshfs) +no file-system UMAPFS # NULLFS + uid and gid remapping +no file-system UNION # union file system +no file-system CODA # Coda File System; also needs vcoda (below) +no file-system SMBFS # experimental - CIFS; also needs nsmb (below) + +# accept filters, built as modules +# +no pseudo-device accf_data # dataready accept filter +no pseudo-device accf_http # httpready accept filter + +# pseudo devices, available as modules +# +no pseudo-device vcoda # coda minicache - venus comm. +no pseudo-device nsmb # experimental - SMB requester + +# these drivers are available as modules +# +#no acpiacad* +#no acpibat* +#no acpibut* +#no acpicpu* +#no acpidalb* +#no acpifan* +#no acpilid* +#no acpitz* +#no acpivga* +#no acpiwdrt* +#no acpiwmi* + +#no aibs* + +no uvideo* +no pseye* + +no hdaudio* +no hdafg* + +#no cir* +#no irmce* + +#no alc* +#no ath* +#no axe* +#no rum*
CVS commit: src/usr.bin/vmstat
Module Name:src
Committed By: jym
Date: Wed Sep 21 12:08:02 UTC 2011
Modified Files:
src/usr.bin/vmstat: vmstat.c
Log Message:
Use __arraycount(), as done above.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/usr.bin/vmstat/vmstat.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/vmstat/vmstat.c
diff -u src/usr.bin/vmstat/vmstat.c:1.183 src/usr.bin/vmstat/vmstat.c:1.184
--- src/usr.bin/vmstat/vmstat.c:1.183 Tue Sep 6 18:44:46 2011
+++ src/usr.bin/vmstat/vmstat.c Wed Sep 21 12:08:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.183 2011/09/06 18:44:46 joerg Exp $ */
+/* $NetBSD: vmstat.c,v 1.184 2011/09/21 12:08:02 jym Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
#if 0
static char sccsid[] = @(#)vmstat.c 8.2 (Berkeley) 3/1/95;
#else
-__RCSID($NetBSD: vmstat.c,v 1.183 2011/09/06 18:44:46 joerg Exp $);
+__RCSID($NetBSD: vmstat.c,v 1.184 2011/09/21 12:08:02 jym Exp $);
#endif
#endif /* not lint */
@@ -1486,8 +1486,7 @@
cpuhit = 0;
cpumiss = 0;
- for (i = 0; i sizeof(pc-pc_cpus) / sizeof(pc-pc_cpus[0]);
- i++) {
+ for (i = 0; i __arraycount(pc-pc_cpus); i++) {
if ((addr = pc-pc_cpus[i]) == NULL)
continue;
deref_kptr(addr, cc, sizeof(*cc),
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: rkujawa
Date: Wed Sep 21 12:40:25 UTC 2011
Modified Files:
src/sys/arch/amiga/dev: zbus.c zbusvar.h
Log Message:
Fix build for both amiga and amigappc (discussed with christos).
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/dev/zbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/dev/zbusvar.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/amiga/dev/zbus.c
diff -u src/sys/arch/amiga/dev/zbus.c:1.66 src/sys/arch/amiga/dev/zbus.c:1.67
--- src/sys/arch/amiga/dev/zbus.c:1.66 Tue Sep 20 18:11:51 2011
+++ src/sys/arch/amiga/dev/zbus.c Wed Sep 21 12:40:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zbus.c,v 1.66 2011/09/20 18:11:51 christos Exp $ */
+/* $NetBSD: zbus.c,v 1.67 2011/09/21 12:40:25 rkujawa Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zbus.c,v 1.66 2011/09/20 18:11:51 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: zbus.c,v 1.67 2011/09/21 12:40:25 rkujawa Exp $);
#include sys/param.h
#include sys/device.h
@@ -239,7 +239,6 @@
int zbusprint(void *, const char *);
int zbusmatch(device_t, cfdata_t, void *);
static const char *aconflookup(int, int);
-static void *zbusmap(void *, u_int);
/*
* given a manufacturer id and product id, find quirks
@@ -388,7 +387,7 @@
* Zorro devices) to have enough kva-space available, so there is no extra
* range check done here.
*/
-static void *
+void *
zbusmap(void *pa, u_int size)
{
#if defined(__m68k__)
Index: src/sys/arch/amiga/dev/zbusvar.h
diff -u src/sys/arch/amiga/dev/zbusvar.h:1.8 src/sys/arch/amiga/dev/zbusvar.h:1.9
--- src/sys/arch/amiga/dev/zbusvar.h:1.8 Tue Feb 2 19:03:31 2010
+++ src/sys/arch/amiga/dev/zbusvar.h Wed Sep 21 12:40:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zbusvar.h,v 1.8 2010/02/02 19:03:31 phx Exp $ */
+/* $NetBSD: zbusvar.h,v 1.9 2011/09/21 12:40:25 rkujawa Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -52,6 +52,8 @@
#define ZTWOROMTOP (0x00F8)
#define NZTWOROMPG btoc(ZTWOROMTOP-ZTWOROMBASE)
+void * zbusmap(void *pa, u_int size);
+
/*
* maps a ztwo and/or A3000 builtin address into the mapped kva address
*/
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: christos Date: Wed Sep 21 12:48:57 UTC 2011 Modified Files: src/sys/arch/amiga/dev: zbusvar.h Log Message: no parameter names. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/dev/zbusvar.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/amiga/dev/zbusvar.h diff -u src/sys/arch/amiga/dev/zbusvar.h:1.9 src/sys/arch/amiga/dev/zbusvar.h:1.10 --- src/sys/arch/amiga/dev/zbusvar.h:1.9 Wed Sep 21 08:40:25 2011 +++ src/sys/arch/amiga/dev/zbusvar.h Wed Sep 21 08:48:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: zbusvar.h,v 1.9 2011/09/21 12:40:25 rkujawa Exp $ */ +/* $NetBSD: zbusvar.h,v 1.10 2011/09/21 12:48:57 christos Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -52,7 +52,7 @@ #define ZTWOROMTOP (0x00F8) #define NZTWOROMPG btoc(ZTWOROMTOP-ZTWOROMBASE) -void * zbusmap(void *pa, u_int size); +void *zbusmap(void *, u_int); /* * maps a ztwo and/or A3000 builtin address into the mapped kva address
CVS commit: src/sys/arch/amiga/include
Module Name:src Committed By: rkujawa Date: Wed Sep 21 13:05:32 UTC 2011 Modified Files: src/sys/arch/amiga/include: bus.h Log Message: Remove zbusmap prototype from bus.h (now in zbusvar.h) To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/include/bus.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/amiga/include/bus.h diff -u src/sys/arch/amiga/include/bus.h:1.24 src/sys/arch/amiga/include/bus.h:1.25 --- src/sys/arch/amiga/include/bus.h:1.24 Thu Aug 4 17:48:51 2011 +++ src/sys/arch/amiga/include/bus.h Wed Sep 21 13:05:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.24 2011/08/04 17:48:51 rkujawa Exp $ */ +/* $NetBSD: bus.h,v 1.25 2011/09/21 13:05:32 rkujawa Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. All rights reserved. @@ -280,7 +280,5 @@ extern const struct amiga_bus_space_methods amiga_bus_stride_4swap; extern const struct amiga_bus_space_methods amiga_bus_stride_16; -void *zbusmap(void *pa, u_int size); - #endif /* _AMIGA_BUS_H_ */
CVS commit: src/usr.bin/make
Module Name:src Committed By: christos Date: Wed Sep 21 14:30:48 UTC 2011 Modified Files: src/usr.bin/make: meta.c Log Message: PR/45383: Henning Petersen: Swapped lseek args To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/meta.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/make/meta.c diff -u src/usr.bin/make/meta.c:1.23 src/usr.bin/make/meta.c:1.24 --- src/usr.bin/make/meta.c:1.23 Fri Sep 2 12:26:21 2011 +++ src/usr.bin/make/meta.c Wed Sep 21 10:30:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.23 2011/09/02 16:26:21 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.24 2011/09/21 14:30:47 christos Exp $ */ /* * Implement 'meta' mode. @@ -159,7 +159,7 @@ return; } /* rewind */ -lseek(fd, SEEK_SET, 0); +(void)lseek(fd, (off_t)0, SEEK_SET); if ((fp = fdopen(fd, r)) == NULL) err(1, Could not read build monitor file '%d', fd);
CVS commit: src/usr.bin/audio/record
Module Name:src Committed By: christos Date: Wed Sep 21 14:32:14 UTC 2011 Modified Files: src/usr.bin/audio/record: record.c Log Message: PR/45384: Henning Petersen: Swapped arguments in lseek To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/usr.bin/audio/record/record.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/audio/record/record.c diff -u src/usr.bin/audio/record/record.c:1.51 src/usr.bin/audio/record/record.c:1.52 --- src/usr.bin/audio/record/record.c:1.51 Sat Aug 27 21:17:48 2011 +++ src/usr.bin/audio/record/record.c Wed Sep 21 10:32:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: record.c,v 1.51 2011/08/28 01:17:48 joerg Exp $ */ +/* $NetBSD: record.c,v 1.52 2011/09/21 14:32:14 christos Exp $ */ /* * Copyright (c) 1999, 2002, 2003, 2005, 2010 Matthew R. Green @@ -32,7 +32,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: record.c,v 1.51 2011/08/28 01:17:48 joerg Exp $); +__RCSID($NetBSD: record.c,v 1.52 2011/09/21 14:32:14 christos Exp $); #endif @@ -755,7 +755,7 @@ if (outfd == STDOUT_FILENO) return; - if (lseek(outfd, SEEK_SET, 0) 0) + if (lseek(outfd, (off_t)0, SEEK_SET) == (off_t)-1) err(1, could not seek to start of file for header rewrite); write_header(); }
CVS commit: src/usr.bin/gencat
Module Name:src
Committed By: christos
Date: Wed Sep 21 14:33:35 UTC 2011
Modified Files:
src/usr.bin/gencat: gencat.c
Log Message:
PR/45385: Henning Petersen: Swapped arguments in lseek
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/gencat/gencat.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/gencat/gencat.c
diff -u src/usr.bin/gencat/gencat.c:1.31 src/usr.bin/gencat/gencat.c:1.32
--- src/usr.bin/gencat/gencat.c:1.31 Sun Sep 4 16:27:05 2011
+++ src/usr.bin/gencat/gencat.c Wed Sep 21 10:33:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gencat.c,v 1.31 2011/09/04 20:27:05 joerg Exp $ */
+/* $NetBSD: gencat.c,v 1.32 2011/09/21 14:33:35 christos Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: gencat.c,v 1.31 2011/09/04 20:27:05 joerg Exp $);
+__RCSID($NetBSD: gencat.c,v 1.32 2011/09/21 14:33:35 christos Exp $);
#endif
/***
@@ -186,7 +186,7 @@
curfile = catfile;
updatecat = 1;
MCReadCat(ofd);
- if (lseek(ofd, SEEK_SET, 0) 0) {
+ if (lseek(ofd, (off_t)0, SEEK_SET) == (off_t)-1) {
err(1, Unable to seek on %s, catfile);
/* NOTREACHED */
}
CVS commit: src/sys/arch/arm/marvell
Module Name:src
Committed By: reinoud
Date: Wed Sep 21 14:38:51 UTC 2011
Modified Files:
src/sys/arch/arm/marvell: mvsoc.c
Log Message:
Add revision 3/A1 of the KIRKWOOD
{ KIRKWOOD(88F6192),3, 88F619x, A1, Kirkwood },
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/mvsoc.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/arm/marvell/mvsoc.c
diff -u src/sys/arch/arm/marvell/mvsoc.c:1.3 src/sys/arch/arm/marvell/mvsoc.c:1.4
--- src/sys/arch/arm/marvell/mvsoc.c:1.3 Sat Jul 30 04:34:17 2011
+++ src/sys/arch/arm/marvell/mvsoc.c Wed Sep 21 14:38:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc.c,v 1.3 2011/07/30 04:34:17 jakllsch Exp $ */
+/* $NetBSD: mvsoc.c,v 1.4 2011/09/21 14:38:51 reinoud Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.3 2011/07/30 04:34:17 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.4 2011/09/21 14:38:51 reinoud Exp $);
#include opt_cputypes.h
#include opt_mvsoc.h
@@ -172,6 +172,7 @@
{ KIRKWOOD(88F6180), 2, 88F6180, A0, Kirkwood },
{ KIRKWOOD(88F6192), 0, 88F619x, Z0, Kirkwood },
{ KIRKWOOD(88F6192), 2, 88F619x, A0, Kirkwood },
+ { KIRKWOOD(88F6192), 3, 88F619x, A1, Kirkwood },
{ KIRKWOOD(88F6281), 0, 88F6281, Z0, Kirkwood },
{ KIRKWOOD(88F6281), 2, 88F6281, A0, Kirkwood },
{ KIRKWOOD(88F6281), 3, 88F6281, A1, Kirkwood },
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: cegger
Date: Wed Sep 21 15:26:47 UTC 2011
Modified Files:
src/sys/arch/xen/xen: evtchn.c
Log Message:
Initialize mutex before use. Lets me boot a dom0 kernel again
without a lockdebug panic.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/xen/xen/evtchn.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/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.54 src/sys/arch/xen/xen/evtchn.c:1.55
--- src/sys/arch/xen/xen/evtchn.c:1.54 Tue Sep 20 00:12:24 2011
+++ src/sys/arch/xen/xen/evtchn.c Wed Sep 21 15:26:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.c,v 1.54 2011/09/20 00:12:24 jym Exp $ */
+/* $NetBSD: evtchn.c,v 1.55 2011/09/21 15:26:47 cegger Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,7 +54,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.54 2011/09/20 00:12:24 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: evtchn.c,v 1.55 2011/09/21 15:26:47 cegger Exp $);
#include opt_xen.h
#include isa.h
@@ -179,6 +179,7 @@
void
events_init(void)
{
+ mutex_init(evtchn_lock, MUTEX_DEFAULT, IPL_NONE);
debug_port = bind_virq_to_evtch(VIRQ_DEBUG);
KASSERT(debug_port != -1);
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: manu
Date: Wed Sep 21 15:36:33 UTC 2011
Modified Files:
src/sys/fs/puffs: puffs_vfsops.c puffs_vnops.c
Log Message:
Make sure ioflush does not sleep in PUFFS code path, waiting for a mutex,
a memory allocation, or a response from the filesystem.
This avoids deadlocks in the following situations:
1) when memory is low: ioflush waits the fileystem, the fielsystem waits
for memory
2) when the filesystem does not respond (e.g.: network outage ona
distributed filesystem)
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/fs/puffs/puffs_vfsops.c
cvs rdiff -u -r1.155 -r1.156 src/sys/fs/puffs/puffs_vnops.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/fs/puffs/puffs_vfsops.c
diff -u src/sys/fs/puffs/puffs_vfsops.c:1.96 src/sys/fs/puffs/puffs_vfsops.c:1.97
--- src/sys/fs/puffs/puffs_vfsops.c:1.96 Sun Jun 12 03:35:54 2011
+++ src/sys/fs/puffs/puffs_vfsops.c Wed Sep 21 15:36:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vfsops.c,v 1.96 2011/06/12 03:35:54 rmind Exp $ */
+/* $NetBSD: puffs_vfsops.c,v 1.97 2011/09/21 15:36:33 manu Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vfsops.c,v 1.96 2011/06/12 03:35:54 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vfsops.c,v 1.97 2011/09/21 15:36:33 manu Exp $);
#include sys/param.h
#include sys/mount.h
@@ -513,9 +513,10 @@
{
struct puffs_node *pn;
struct vnode *vp, *mvp;
- int error, rv;
+ int error, rv, fsyncwait;
error = 0;
+ fsyncwait = (waitfor == MNT_WAIT) ? FSYNC_WAIT : 0;
/* Allocate a marker vnode. */
if ((mvp = vnalloc(mp)) == NULL)
@@ -574,7 +575,7 @@
pn-pn_stat |= PNODE_FAF;
mutex_exit(vp-v_interlock);
}
- rv = VOP_FSYNC(vp, cred, waitfor, 0, 0);
+ rv = VOP_FSYNC(vp, cred, fsyncwait, 0, 0);
if (waitfor == MNT_LAZY) {
mutex_enter(vp-v_interlock);
pn-pn_stat = ~PNODE_FAF;
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.155 src/sys/fs/puffs/puffs_vnops.c:1.156
--- src/sys/fs/puffs/puffs_vnops.c:1.155 Mon Aug 29 04:12:45 2011
+++ src/sys/fs/puffs/puffs_vnops.c Wed Sep 21 15:36:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.155 2011/08/29 04:12:45 manu Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.156 2011/09/21 15:36:33 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.155 2011/08/29 04:12:45 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.156 2011/09/21 15:36:33 manu Exp $);
#include sys/param.h
#include sys/buf.h
@@ -50,6 +50,8 @@
#include miscfs/genfs/genfs.h
#include miscfs/specfs/specdev.h
+extern struct lwp *updateproc;
+
int puffs_vnop_lookup(void *);
int puffs_vnop_create(void *);
int puffs_vnop_access(void *);
@@ -1357,7 +1359,21 @@
struct puffs_mount *pmp = MPTOPUFFSMP(vp-v_mount);
int error, dofaf;
- mutex_enter(pn-pn_sizemtx);
+ /*
+ * Make sure ioflush does not get stuck in low
+ * memory conditions: it should not wait for the
+ * mutex.
+ */
+ if (curlwp == updateproc)
+ KASSERT((ap-a_flags FSYNC_WAIT) == 0);
+
+ if (ap-a_flags FSYNC_WAIT) {
+ mutex_enter(pn-pn_sizemtx);
+ } else {
+ if (mutex_tryenter(pn-pn_sizemtx) == 0)
+ return EDEADLK;
+ }
+
error = flushvncache(vp, ap-a_offlo, ap-a_offhi,
(ap-a_flags FSYNC_WAIT) == FSYNC_WAIT);
if (error)
@@ -2211,12 +2227,13 @@
struct buf *bp;
size_t argsize;
size_t tomove, moved;
- int error, dofaf, dobiodone;
+ int error, dofaf, cansleep, dobiodone;
pmp = MPTOPUFFSMP(vp-v_mount);
bp = ap-a_bp;
error = 0;
dofaf = 0;
+ cansleep = 0;
pn = VPTOPP(vp);
park_rw = NULL; /* explicit */
dobiodone = 1;
@@ -2264,8 +2281,9 @@
/* allocate transport structure */
tomove = PUFFS_TOMOVE(bp-b_bcount, pmp);
argsize = sizeof(struct puffs_vnmsg_rw);
+ cansleep = (dofaf || (curlwp == updateproc)) ? 0 : 1;
error = puffs_msgmem_alloc(argsize + tomove, park_rw,
- (void *)rw_msg, dofaf ? 0 : 1);
+ (void *)rw_msg, cansleep);
if (error)
goto out;
RWARGS(rw_msg, 0, tomove, bp-b_blkno DEV_BSHIFT, FSCRED);
CVS commit: src/distrib/ews4800mips/floppies/bootfloppy
Module Name:src
Committed By: christos
Date: Wed Sep 21 16:13:51 UTC 2011
Modified Files:
src/distrib/ews4800mips/floppies/bootfloppy: Makefile
Log Message:
buildfloppies.sh: Image is 29012 bytes (28 KB) too big to fit on 2 disks
So make it 3 floppes until someone finds a way to conserve space. The
build has been broken for months.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/ews4800mips/floppies/bootfloppy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/ews4800mips/floppies/bootfloppy/Makefile
diff -u src/distrib/ews4800mips/floppies/bootfloppy/Makefile:1.1 src/distrib/ews4800mips/floppies/bootfloppy/Makefile:1.2
--- src/distrib/ews4800mips/floppies/bootfloppy/Makefile:1.1 Thu Dec 29 11:01:30 2005
+++ src/distrib/ews4800mips/floppies/bootfloppy/Makefile Wed Sep 21 12:13:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2005/12/29 16:01:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2011/09/21 16:13:51 christos Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -6,7 +6,7 @@
FLOPPYBASE= boot
FLOPPYSIZE= 1989 # 2D excluding cylinder 0 side 0
FLOPPYFILES= boot netbsd
-FLOPPYMAX= 2
+FLOPPYMAX= 3
FLOPPYSUFFIX= .fs
FLOPPY_RELEASEDIR= installation/floppy
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: macallan
Date: Wed Sep 21 16:37:54 UTC 2011
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
make the code that deals with mapping regular memory non-cached work again:
- honour PMAP_NOCACHE
- move the PGC_NOCACHE stuff out of #ifdef PARANOIADIAG
we need this to mmap DMA buffers non-cached on sgimips
To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/sys/arch/mips/mips/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/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.202 src/sys/arch/mips/mips/pmap.c:1.203
--- src/sys/arch/mips/mips/pmap.c:1.202 Sun Jun 12 01:28:29 2011
+++ src/sys/arch/mips/mips/pmap.c Wed Sep 21 16:37:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.202 2011/06/12 01:28:29 tsutsui Exp $ */
+/* $NetBSD: pmap.c,v 1.203 2011/09/21 16:37:54 macallan Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.202 2011/06/12 01:28:29 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.203 2011/09/21 16:37:54 macallan Exp $);
/*
* Manages physical address maps.
@@ -1372,9 +1372,7 @@
pt_entry_t *pte;
u_int npte;
struct vm_page *pg;
-#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
bool cached = true;
-#endif
bool wired = (flags PMAP_WIRED) != 0;
#ifdef DEBUG
@@ -1405,6 +1403,11 @@
if (pa 0x8000) /* this is not error in general. */
panic(pmap_enter: pa);
#endif
+
+ if (!(prot VM_PROT_READ))
+ panic(pmap_enter: prot);
+#endif
+
if (flags PMAP_NOCACHE)
cached = 0;
@@ -1414,10 +1417,6 @@
pa = ~PGC_NOCACHE;
}
#endif
-
- if (!(prot VM_PROT_READ))
- panic(pmap_enter: prot);
-#endif
pg = PHYS_TO_VM_PAGE(pa);
if (pg) {
@@ -1438,7 +1437,6 @@
*/
npte = mips_pg_ropage_bit();
else {
-#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
if (cached == false) {
if (PG_MD_MODIFIED_P(md)) {
npte = mips_pg_rwncpage_bit();
@@ -1447,15 +1445,12 @@
}
PMAP_COUNT(uncached_mappings);
} else {
-#endif
if (PG_MD_MODIFIED_P(md)) {
npte = mips_pg_rwpage_bit();
} else {
npte = mips_pg_cwpage_bit();
}
-#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
}
-#endif
}
PMAP_COUNT(managed_mappings);
} else {
CVS commit: src/usr.bin/kdump
Module Name:src
Committed By: christos
Date: Wed Sep 21 17:48:53 UTC 2011
Modified Files:
src/usr.bin/kdump: Makefile kdump.c
Log Message:
Symbolic printing of some known MISC records.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/kdump/Makefile
cvs rdiff -u -r1.113 -r1.114 src/usr.bin/kdump/kdump.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/kdump/Makefile
diff -u src/usr.bin/kdump/Makefile:1.29 src/usr.bin/kdump/Makefile:1.30
--- src/usr.bin/kdump/Makefile:1.29 Tue Apr 14 18:15:21 2009
+++ src/usr.bin/kdump/Makefile Wed Sep 21 13:48:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/04/14 22:15:21 lukem Exp $
+# $NetBSD: Makefile,v 1.30 2011/09/21 17:48:51 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include bsd.own.mk # for MKDYNAMICROOT NETBSDSRCDIR
@@ -18,4 +18,7 @@
.include Makefile.ioctl-c
.include Makefile.siginfo-c
+LDADD+=-lutil
+DPADD+=${LIBUTIL}
+
.include bsd.prog.mk
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.113 src/usr.bin/kdump/kdump.c:1.114
--- src/usr.bin/kdump/kdump.c:1.113 Fri Sep 2 16:11:42 2011
+++ src/usr.bin/kdump/kdump.c Wed Sep 21 13:48:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.113 2011/09/02 20:11:42 christos Exp $ */
+/* $NetBSD: kdump.c,v 1.114 2011/09/21 17:48:53 christos Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)kdump.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: kdump.c,v 1.113 2011/09/02 20:11:42 christos Exp $);
+__RCSID($NetBSD: kdump.c,v 1.114 2011/09/21 17:48:53 christos Exp $);
#endif
#endif /* not lint */
@@ -54,6 +54,7 @@
#include sys/ktrace.h
#include sys/ioctl.h
#include sys/ptrace.h
+#include sys/socket.h
#include ctype.h
#include err.h
@@ -64,6 +65,7 @@
#include string.h
#include unistd.h
#include vis.h
+#include util.h
#include ktrace.h
#include setemul.h
@@ -1011,23 +1013,86 @@
}
static void
+ktruser_msghdr(const char *name, const void *buf, size_t len)
+{
+ struct msghdr m;
+
+ if (len != sizeof(m))
+ warnx(%.*s: len %zu != %zu, KTR_USER_MAXIDLEN, name, len,
+ sizeof(m));
+ memcpy(m, buf, len);
+ printf(%.*s: [name=%p, namelen=%zu, iov=%p, iovlen=%zu, control=%p,
+ controllen=%zu, flags=%x]\n, KTR_USER_MAXIDLEN, name,
+ m.msg_name, (size_t)m.msg_namelen, m.msg_iov, (size_t)m.msg_iovlen,
+ m.msg_control, (size_t)m.msg_controllen, m.msg_flags);
+}
+
+static void
+ktruser_soname(const char *name, const void *buf, size_t len)
+{
+ char fmt[512];
+ struct sockaddr_storage ss;
+
+ memset(ss, 0, sizeof(ss));
+ memcpy(ss, buf, len);
+ sockaddr_snprintf(fmt, sizeof(fmt), %a, (struct sockaddr *)ss);
+ printf(%.*s: [%s]\n, KTR_USER_MAXIDLEN, name, fmt);
+}
+
+static void
+ktruser_control(const char *name, const void *buf, size_t len)
+{
+ struct cmsghdr m;
+
+ if (len sizeof(m))
+ warnx(%.*s: len %zu %zu, KTR_USER_MAXIDLEN, name, len,
+ sizeof(m));
+ memcpy(m, buf, sizeof(m));
+ printf(%.*s: [len=%zu, level=%d, type=%d]\n, KTR_USER_MAXIDLEN, name,
+ (size_t)m.cmsg_len, m.cmsg_level, m.cmsg_type);
+}
+
+static void
+ktruser_misc(const char *name, const void *buf, size_t len)
+{
+ size_t i;
+ const char *dta = buf;
+
+ printf(%.*s: %zu, , KTR_USER_MAXIDLEN, name, len);
+ for (i = 0; i len; i++)
+ printf(%02x, (unsigned int) dta[i]);
+ printf(\n);
+}
+
+static struct {
+ const char *name;
+ void (*func)(const char *, const void *, size_t);
+} nv[] = {
+ { msghdr, ktruser_msghdr },
+ { mbsoname, ktruser_soname },
+ { mbcontrol, ktruser_control },
+ { NULL, ktruser_misc },
+};
+
+static void
ktruser(struct ktr_user *usr, int len)
{
- int i;
unsigned char *dta;
len -= sizeof(struct ktr_user);
- printf(%.*s:, KTR_USER_MAXIDLEN, usr-ktr_id);
dta = (unsigned char *)(usr + 1);
if (word_size) {
+ printf(%.*s:, KTR_USER_MAXIDLEN, usr-ktr_id);
printf(\n);
hexdump_buf(dta, len, word_size);
return;
}
- printf( %d, , len);
- for (i = 0; i len; i++)
- printf(%02x, (unsigned int) dta[i]);
- printf(\n);
+ for (size_t j = 0; j __arraycount(nv); j++)
+ if (nv[j].name == NULL ||
+ strncmp(nv[j].name, usr-ktr_id, KTR_USER_MAXIDLEN) == 0) {
+ (*nv[j].func)(usr-ktr_id, dta, len);
+ break;
+ }
}
static void
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Wed Sep 21 18:10:25 UTC 2011
Modified Files:
src/sys/kern: uipc_syscalls.c
src/sys/sys: mbuf.h
Log Message:
Put the mbuf type in the ktrace record so that we know how to decode it
in userland.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.145 -r1.146 src/sys/sys/mbuf.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/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.146 src/sys/kern/uipc_syscalls.c:1.147
--- src/sys/kern/uipc_syscalls.c:1.146 Wed Jul 27 10:35:34 2011
+++ src/sys/kern/uipc_syscalls.c Wed Sep 21 14:10:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.146 2011/07/27 14:35:34 uebayasi Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.147 2011/09/21 18:10:25 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.146 2011/07/27 14:35:34 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.147 2011/09/21 18:10:25 christos Exp $);
#include opt_pipe.h
@@ -71,6 +71,7 @@
#include sys/proc.h
#include sys/file.h
#include sys/buf.h
+#define MBUFTYPES
#include sys/mbuf.h
#include sys/protosw.h
#include sys/socket.h
@@ -1224,7 +1225,7 @@
(void) m_free(m);
return (error);
}
- ktrkuser(sockargs, mtod(m, void *), buflen);
+ ktrkuser(mbuftypes[type], mtod(m, void *), buflen);
*mp = m;
if (type == MT_SONAME) {
sa = mtod(m, struct sockaddr *);
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.145 src/sys/sys/mbuf.h:1.146
--- src/sys/sys/mbuf.h:1.145 Mon Aug 8 15:10:33 2011
+++ src/sys/sys/mbuf.h Wed Sep 21 14:10:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.145 2011/08/08 19:10:33 dyoung Exp $ */
+/* $NetBSD: mbuf.h,v 1.146 2011/09/21 18:10:25 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -379,6 +379,19 @@
#define MT_CONTROL 6 /* extra-data protocol message */
#define MT_OOBDATA 7 /* expedited data */
+#ifdef MBUFTYPES
+static const char *mbuftypes[] = {
+ mbfree,
+ mbdata,
+ mbheader,
+ mbsoname,
+ mbsopts,
+ mbftable,
+ mbcontrol,
+ mboobdata,
+};
+#endif
+
/* flags to m_get/MGET */
#define M_DONTWAIT M_NOWAIT
#define M_WAIT M_WAITOK
CVS commit: src/sys/arch/i386/stand/mbr/gptmbr
Module Name:src Committed By: jakllsch Date: Wed Sep 21 18:15:59 UTC 2011 Modified Files: src/sys/arch/i386/stand/mbr/gptmbr: Makefile Log Message: Set LOADADDR to 0x600, matches how gptmbr.bin is compiled upstream. This should let this actually work. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/mbr/gptmbr/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/i386/stand/mbr/gptmbr/Makefile diff -u src/sys/arch/i386/stand/mbr/gptmbr/Makefile:1.2 src/sys/arch/i386/stand/mbr/gptmbr/Makefile:1.3 --- src/sys/arch/i386/stand/mbr/gptmbr/Makefile:1.2 Wed Aug 17 22:26:40 2011 +++ src/sys/arch/i386/stand/mbr/gptmbr/Makefile Wed Sep 21 18:15:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/08/17 22:26:40 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2011/09/21 18:15:59 jakllsch Exp $ PROG= gptmbr.bin SRCS= gptmbr.S @@ -7,4 +7,4 @@ .include ../Makefile.mbr -LOADADDR= 0 +LOADADDR= 0x600
CVS commit: src/usr.sbin/sup/source
Module Name:src
Committed By: christos
Date: Wed Sep 21 19:32:59 UTC 2011
Modified Files:
src/usr.sbin/sup/source: path.c supextern.h
Log Message:
constify
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sup/source/path.c
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sup/source/supextern.h
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/sup/source/path.c
diff -u src/usr.sbin/sup/source/path.c:1.4 src/usr.sbin/sup/source/path.c:1.5
--- src/usr.sbin/sup/source/path.c:1.4 Wed Jul 10 16:19:41 2002
+++ src/usr.sbin/sup/source/path.c Wed Sep 21 15:32:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: path.c,v 1.4 2002/07/10 20:19:41 wiz Exp $ */
+/* $NetBSD: path.c,v 1.5 2011/09/21 19:32:59 christos Exp $ */
/*
* Copyright (c) 1991 Carnegie Mellon University
@@ -62,11 +62,11 @@
#include supextern.h
void
-path(char *original, char *direc, char *file)
+path(const char *original, char *direc, char *file)
{
char *y;
/* x is direc */
- char *p;
+ const char *p;
/* copy and note the end */
p = original;
Index: src/usr.sbin/sup/source/supextern.h
diff -u src/usr.sbin/sup/source/supextern.h:1.22 src/usr.sbin/sup/source/supextern.h:1.23
--- src/usr.sbin/sup/source/supextern.h:1.22 Sat Oct 17 18:26:13 2009
+++ src/usr.sbin/sup/source/supextern.h Wed Sep 21 15:32:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: supextern.h,v 1.22 2009/10/17 22:26:13 christos Exp $ */
+/* $NetBSD: supextern.h,v 1.23 2011/09/21 19:32:59 christos Exp $ */
struct stat;
@@ -39,7 +39,7 @@
char *nxtarg(char **, const char *);
/* path.c */
-void path(char *, char *, char *);
+void path(const char *, char *, char *);
/* quit.c */
void quit(int, const char *, ...)
CVS commit: src/usr.sbin/sup/source
Module Name:src Committed By: christos Date: Wed Sep 21 19:34:54 UTC 2011 Modified Files: src/usr.sbin/sup/source: sup.1 supcdefs.h supcmain.c supcmeat.c supcparse.c Log Message: Add a canonicalize option to avoid disaster when one converts directories to symlinks in the tree and back. This option is expensive, it could be made better by cacheing, but not now. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sup/source/sup.1 cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sup/source/supcdefs.h cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/sup/source/supcmain.c cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/sup/source/supcmeat.c cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sup/source/supcparse.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.sbin/sup/source/sup.1 diff -u src/usr.sbin/sup/source/sup.1:1.18 src/usr.sbin/sup/source/sup.1:1.19 --- src/usr.sbin/sup/source/sup.1:1.18 Sun Nov 1 19:29:04 2009 +++ src/usr.sbin/sup/source/sup.1 Wed Sep 21 15:34:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: sup.1,v 1.18 2009/11/02 00:29:04 joerg Exp $ +.\ $NetBSD: sup.1,v 1.19 2011/09/21 19:34:54 christos Exp $ .\ .\ Copyright (c) 1992 Carnegie Mellon University .\ All Rights Reserved. @@ -197,6 +197,16 @@ .B backup supfile option. .TP +.B -C +The +.B -C +flag or the +.B canonicalize +supfile option, canonicalize all pathnames upon reception to make sure +local changes from directories to symlinks and vice versa have not happened +behind sup's back, and attempt to repair them. This option is expensive. +.TP +.TP .B -d Files that are no longer in the collection on the repository will be deleted if present on the local @@ -861,6 +871,8 @@ that contains the same names. Then sup will cross the symlink and start deleting files and directories from the destination. -This is not easily fixed. +This is avoided by using the +.B canonicalize +option, but it is expensive. Don't use sup with symlink/rsymlink and the delete option at the same time or *be careful*! Index: src/usr.sbin/sup/source/supcdefs.h diff -u src/usr.sbin/sup/source/supcdefs.h:1.13 src/usr.sbin/sup/source/supcdefs.h:1.14 --- src/usr.sbin/sup/source/supcdefs.h:1.13 Fri Nov 29 22:10:58 2002 +++ src/usr.sbin/sup/source/supcdefs.h Wed Sep 21 15:34:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: supcdefs.h,v 1.13 2002/11/30 03:10:58 lukem Exp $ */ +/* $NetBSD: supcdefs.h,v 1.14 2011/09/21 19:34:54 christos Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -116,6 +116,7 @@ #define CFURELSUF 02000 #define CFCOMPRESS 04000 #define CFSILENT 1 +#define CFCANONICALIZE 2 /* *** M A C R O S*** Index: src/usr.sbin/sup/source/supcmain.c diff -u src/usr.sbin/sup/source/supcmain.c:1.31 src/usr.sbin/sup/source/supcmain.c:1.32 --- src/usr.sbin/sup/source/supcmain.c:1.31 Wed Aug 31 12:25:00 2011 +++ src/usr.sbin/sup/source/supcmain.c Wed Sep 21 15:34:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: supcmain.c,v 1.31 2011/08/31 16:25:00 plunky Exp $ */ +/* $NetBSD: supcmain.c,v 1.32 2011/09/21 19:34:54 christos Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -470,7 +470,7 @@ int oflags, aflags; int c; -#define SUPOPTIONS abBdDeEfkKlmM:NoOPRsStuvXzZ=: +#define SUPOPTIONS abBCdDeEfkKlmM:NoOPRsStuvXzZ=: oflags = aflags = 0; while ((c = getopt(*argc, *argv, SUPOPTIONS)) != -1) @@ -502,6 +502,9 @@ oflags = ~CFBACKUP; aflags |= CFBACKUP; break; + case 'C': + oflags |= CFCANONICALIZE; + break; case 'd': oflags |= CFDELETE; aflags = ~CFDELETE; Index: src/usr.sbin/sup/source/supcmeat.c diff -u src/usr.sbin/sup/source/supcmeat.c:1.39 src/usr.sbin/sup/source/supcmeat.c:1.40 --- src/usr.sbin/sup/source/supcmeat.c:1.39 Wed Aug 31 12:25:00 2011 +++ src/usr.sbin/sup/source/supcmeat.c Wed Sep 21 15:34:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: supcmeat.c,v 1.39 2011/08/31 16:25:00 plunky Exp $ */ +/* $NetBSD: supcmeat.c,v 1.40 2011/09/21 19:34:54 christos Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -140,6 +140,7 @@ static int linkone(TREE *, void *); static int execone(TREE *, void *); static int finishone(TREE *, void *); +static int canonicalize(const char *); /* The next two routines define the fsm to support multiple fileservers @@ -493,6 +494,8 @@ *q = '\0'; if (strchr(#;:, *p)) continue; + if (canonicalize(p) != 0) +continue; (void) Tinsert(lastT, p, FALSE); } (void) fclose(f); @@ -720,6 +723,8 @@ goaway(Error sending compression check to server); if (docompress) vnotify(SUP Using compressed file transfer\n); + if (thisC-Cflags CFCANONICALIZE) + vnotify(SUP Filename canonicalization is on\n); } recvmore = TRUE; upgradeT = NULL; @@ -942,10 +947,22 @@ char dirpart[STRINGLENGTH], filepart[STRINGLENGTH]; char filename[STRINGLENGTH], buf[STRINGLENGTH]; struct timeval
CVS commit: src/usr.sbin/sup/source
Module Name:src Committed By: wiz Date: Wed Sep 21 20:12:12 UTC 2011 Modified Files: src/usr.sbin/sup/source: sup.1 Log Message: New sentence, new line. Remove empty EXAMPLE section. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sup/source/sup.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.sbin/sup/source/sup.1 diff -u src/usr.sbin/sup/source/sup.1:1.19 src/usr.sbin/sup/source/sup.1:1.20 --- src/usr.sbin/sup/source/sup.1:1.19 Wed Sep 21 19:34:54 2011 +++ src/usr.sbin/sup/source/sup.1 Wed Sep 21 20:12:11 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: sup.1,v 1.19 2011/09/21 19:34:54 christos Exp $ +.\ $NetBSD: sup.1,v 1.20 2011/09/21 20:12:11 wiz Exp $ .\ .\ Copyright (c) 1992 Carnegie Mellon University .\ All Rights Reserved. @@ -54,7 +54,8 @@ .SH DESCRIPTION .I Sup is a program used for upgrading collections of files from other machines -to your machine. You execute +to your machine. +You execute .IR sup , the .I client @@ -66,22 +67,28 @@ to determine which files of the collection need to be upgraded on your machine. -Sup collections can have multiple releases. One use for such releases is -to provide different versions of the same files. At CMU, for example, +Sup collections can have multiple releases. +One use for such releases is +to provide different versions of the same files. +At CMU, for example, system binaries have alpha, beta and default release corresponding to -different staging levels of the software. We also use release names +different staging levels of the software. +We also use release names default and minimal to provide complete releases or subset releases. In both of these cases, it only makes sense to sup one release of the -collections. Releases have also been used in private or external sups to +collections. +Releases have also been used in private or external sups to provide subsets of collections where it makes sense to pick up several -of the releases. For example the Mach 3.0 kernel sources has a default +of the releases. +For example the Mach 3.0 kernel sources has a default release of machine independent sources and separate releases of machine dependent sources for each supported platform. In performing an upgrade, the file server constructs a list of -files included in the specified release of the collection. The list is sent to your machine, -which determines which files are needed. Those files are then sent -from the file server. +files included in the specified release of the collection. +The list is sent to your machine, +which determines which files are needed. +Those files are then sent from the file server. It will be most useful to run .I sup as a daemon each night so you will continually have the latest version of the @@ -89,15 +96,17 @@ The only required argument to .I sup -is the name of a supfile. It must either be given explicitly on the command -line, or the +is the name of a supfile. +It must either be given explicitly on the command line, or the .B -s -flag must be specified. If the +flag must be specified. +If the .B -s flag is given, the system supfile will be used and a supfile command argument -should not be specified. The list of collections is optional and if specified -will be the only collections upgraded. The following flags affect all -collections specified: +should not be specified. +The list of collections is optional and if specified +will be the only collections upgraded. +The following flags affect all collections specified: .TP .B -s As described above. @@ -131,15 +140,18 @@ .PP The remaining flags affect all collections unless an explicit list -of collections are given with the flags. Multiple flags may be -specified together that affect the same collections. For the sake +of collections are given with the flags. +Multiple flags may be +specified together that affect the same collections. +For the sake of convenience, any flags that always affect all collections can be -specified with flags that affect only some collections. For -example, +specified with flags that affect only some collections. +For example, .B sup -sde=coll1,coll2 would perform a system upgrade, and the first two collections would allow both file deletions and -command executions. Note that this is not the same command as +command executions. +Note that this is not the same command as .B sup -sde=coll1 coll2, which would perform a system upgrade of just the coll2 collection and would ignore the flags given for the @@ -148,10 +160,12 @@ .B -a All files in the collection will be copied from the repository, regardless of their status on the -current machine. Because of this, it is a very +current machine. +Because of this, it is a very expensive operation and should only be done for small collections if data corruption is suspected -and been confirmed. In most cases, the
CVS commit: src/sys
Module Name:src Committed By: jakllsch Date: Thu Sep 22 01:15:31 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL src/sys/dev/acpi: files.acpi Removed Files: src/sys/dev/acpi: valz_acpi.c Log Message: valz(4) is superseded entirely by acpivga(4) these days. To generate a diff of this commit: cvs rdiff -u -r1.319 -r1.320 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.91 -r1.92 src/sys/dev/acpi/files.acpi cvs rdiff -u -r1.3 -r0 src/sys/dev/acpi/valz_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/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.319 src/sys/arch/i386/conf/ALL:1.320 --- src/sys/arch/i386/conf/ALL:1.319 Thu Aug 18 20:55:20 2011 +++ src/sys/arch/i386/conf/ALL Thu Sep 22 01:15:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.319 2011/08/18 20:55:20 jakllsch Exp $ +# $NetBSD: ALL,v 1.320 2011/09/22 01:15:31 jakllsch 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.319 $ +#ident ALL-$Revision: 1.320 $ maxusers 64 # estimated number of users @@ -409,9 +409,6 @@ # Toshiba Libretto devices vald* at acpi? -# Toshiba LCD brightness -valz* at acpi? - # Plug-and-Play BIOS and attached devices pnpbios* at mainbus? Index: src/sys/dev/acpi/files.acpi diff -u src/sys/dev/acpi/files.acpi:1.91 src/sys/dev/acpi/files.acpi:1.92 --- src/sys/dev/acpi/files.acpi:1.91 Wed Jul 13 07:52:48 2011 +++ src/sys/dev/acpi/files.acpi Thu Sep 22 01:15:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.acpi,v 1.91 2011/07/13 07:52:48 jruoho Exp $ +# $NetBSD: files.acpi,v 1.92 2011/09/22 01:15:31 jakllsch Exp $ include dev/acpi/acpica/files.acpica @@ -164,11 +164,6 @@ attach vald at acpinodebus with vald_acpi file dev/acpi/vald_acpi.c vald_acpi -# Toshiba backlight hotkeys -device valz -attach valz at acpinodebus -file dev/acpi/valz_acpi.c valz - # Sony SPIC (jog dial etc.) attach spic at acpinodebus with spic_acpi file dev/acpi/spic_acpi.c spic_acpi
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Thu Sep 22 04:22:19 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libgcc/arch: alpha.mk arm.mk armeb.mk m68000.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: c++config.h config.h src/external/gpl3/gcc/usr.bin/gcc/arch/alpha: configargs.h defs.mk src/external/gpl3/gcc/usr.bin/gcc/arch/arm: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/armeb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/hppa: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/i386: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/m68000: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/m68k: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sparc: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/vax: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: configargs.h Log Message: regenerate. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/arch/alpha.mk cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libgcc/arch/arm.mk cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgcc/arch/m68000.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/configargs.h \ src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/arm/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/configargs.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/configargs.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.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/gpl3/gcc/lib/libgcc/arch/alpha.mk diff -u src/external/gpl3/gcc/lib/libgcc/arch/alpha.mk:1.1 src/external/gpl3/gcc/lib/libgcc/arch/alpha.mk:1.2 --- src/external/gpl3/gcc/lib/libgcc/arch/alpha.mk:1.1 Thu Jul 7 02:07:31 2011 +++ src/external/gpl3/gcc/lib/libgcc/arch/alpha.mk Thu Sep 22 04:22:17 2011 @@ -1,10 +1,10 @@ # This file is automatically generated. DO NOT EDIT! -# Generated from: NetBSD: mknative-gcc,v 1.61 2011/07/03 12:26:02 mrg Exp +# Generated from: NetBSD: mknative-gcc,v 1.62 2011/08/17 18:34:13 matt Exp # Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
CVS commit: src/sys/arch/mips
Module Name:src Committed By: macallan Date: Thu Sep 22 05:08:52 UTC 2011 Modified Files: src/sys/arch/mips/include: cpu.h cpuregs.h mips3_pte.h pmap.h src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c mips_machdep.c pmap.c Log Message: support BUS_SPACE_MAP_PREFETCH in order to allow mapping device memory and DMA buffers with cacheing disabled but things like write combining, relaxed ordering etc. allowed when the CPU supports it so far enabled only on Loongson, should work on R1xk and probably newer CPUs To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mips/include/cpu.h cvs rdiff -u -r1.86 -r1.87 src/sys/arch/mips/include/cpuregs.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/include/mips3_pte.h cvs rdiff -u -r1.60 -r1.61 src/sys/arch/mips/include/pmap.h cvs rdiff -u -r1.15 -r1.16 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c cvs rdiff -u -r1.248 -r1.249 src/sys/arch/mips/mips/mips_machdep.c cvs rdiff -u -r1.203 -r1.204 src/sys/arch/mips/mips/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/mips/include/cpu.h diff -u src/sys/arch/mips/include/cpu.h:1.105 src/sys/arch/mips/include/cpu.h:1.106 --- src/sys/arch/mips/include/cpu.h:1.105 Tue Aug 16 06:58:15 2011 +++ src/sys/arch/mips/include/cpu.h Thu Sep 22 05:08:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.105 2011/08/16 06:58:15 matt Exp $ */ +/* $NetBSD: cpu.h,v 1.106 2011/09/22 05:08:52 macallan Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -258,6 +258,7 @@ bool mips_has_llsc; u_int mips3_pg_shift; u_int mips3_pg_cached; + u_int mips3_cca_devmem; #ifdef MIPS3_PLUS #ifdef _LP64 uint64_t mips3_xkphys_cached; Index: src/sys/arch/mips/include/cpuregs.h diff -u src/sys/arch/mips/include/cpuregs.h:1.86 src/sys/arch/mips/include/cpuregs.h:1.87 --- src/sys/arch/mips/include/cpuregs.h:1.86 Sat Aug 27 13:23:52 2011 +++ src/sys/arch/mips/include/cpuregs.h Thu Sep 22 05:08:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuregs.h,v 1.86 2011/08/27 13:23:52 bouyer Exp $ */ +/* $NetBSD: cpuregs.h,v 1.87 2011/09/22 05:08:52 macallan Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -135,6 +135,8 @@ #define MIPS_XKPHYS_START (0x2ULL 62) #define MIPS_PHYS_TO_XKPHYS_UNCACHED(x) \ (MIPS_XKPHYS_START | ((uint64_t)(CCA_UNCACHED) 59) | (x)) +#define MIPS_PHYS_TO_XKPHYS_ACC(x) \ + (MIPS_XKPHYS_START | ((uint64_t)(mips_options.mips3_cca_devmem) 59) | (x)) #define MIPS_PHYS_TO_XKPHYS_CACHED(x) \ (mips_options.mips3_xkphys_cached | (x)) #define MIPS_PHYS_TO_XKPHYS(cca,x) \ @@ -146,6 +148,7 @@ #define CCA_UNCACHED 2 #define CCA_CACHEABLE 3 /* cacheable non-coherent */ +#define CCA_ACCEL 7 /* non-cached, write combining */ /* CPU dependent mtc0 hazard hook */ #if (MIPS32R2 + MIPS64R2) 0 Index: src/sys/arch/mips/include/mips3_pte.h diff -u src/sys/arch/mips/include/mips3_pte.h:1.27 src/sys/arch/mips/include/mips3_pte.h:1.28 --- src/sys/arch/mips/include/mips3_pte.h:1.27 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/include/mips3_pte.h Thu Sep 22 05:08:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mips3_pte.h,v 1.27 2011/02/20 07:45:47 matt Exp $ */ +/* $NetBSD: mips3_pte.h,v 1.28 2011/09/22 05:08:52 macallan Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -88,7 +88,11 @@ #define MIPS3_PG_TO_CCA(cca) (((cca) 3) 7) #define MIPS3_XPHYS_UNCACHED MIPS_PHYS_TO_XKPHYS(2, 0) +#define MIPS3_XPHYS_ACC MIPS_PHYS_TO_XKPHYS(mips_options.mips3_cca_devmem, 0) + #define MIPS3_PG_UNCACHED MIPS3_CCA_TO_PG(2) +#define MIPS3_PG_WT MIPS3_CCA_TO_PG(5) +#define MIPS3_PG_ACC MIPS3_CCA_TO_PG(mips_options.mips3_cca_devmem) #ifdef HPCMIPS_L1CACHE_DISABLE /* MIPS3_L1CACHE_DISABLE */ #define MIPS3_DEFAULT_XKPHYS_CACHED MIPS3_DEFAULT_XKPHYS_UNCACHED #define MIPS3_PG_CACHED MIPS3_PG_UNCACHED /* XXX: brain damaged!!! */ @@ -108,12 +112,18 @@ /* Not wr-prot not clean not cached */ #define MIPS3_PG_RWNCPAGE (MIPS3_PG_V | MIPS3_PG_D | MIPS3_PG_UNCACHED) +/* Not wr-prot not clean not cached, accel */ +#define MIPS3_PG_RWAPAGE (MIPS3_PG_V | MIPS3_PG_D | MIPS3_PG_ACC) + /* Not wr-prot but clean */ #define MIPS3_PG_CWPAGE (MIPS3_PG_V | MIPS3_PG_CACHED) /* Not wr-prot but clean not cached*/ #define MIPS3_PG_CWNCPAGE (MIPS3_PG_V | MIPS3_PG_UNCACHED) +/* Not wr-prot but clean not cached, accel*/ +#define MIPS3_PG_CWAPAGE (MIPS3_PG_V | MIPS3_PG_ACC) + #define MIPS3_PG_IOPAGE(cca) \ (MIPS3_PG_G | MIPS3_PG_V | MIPS3_PG_D | MIPS3_CCA_TO_PG(cca)) #define MIPS3_PG_FRAME 0x3fc0 Index: src/sys/arch/mips/include/pmap.h diff -u src/sys/arch/mips/include/pmap.h:1.60 src/sys/arch/mips/include/pmap.h:1.61 --- src/sys/arch/mips/include/pmap.h:1.60 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/include/pmap.h Thu Sep 22 05:08:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.60 2011/02/20 07:45:47 matt Exp $ */ +/* $NetBSD: pmap.h,v 1.61 2011/09/22 05:08:52
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: gsutre Date: Wed Sep 21 08:57:12 UTC 2011 Modified Files: src/sys/arch/i386/stand/lib: biosdisk.c Log Message: Fix btinfo_bootdisk's labelsector and btinfo_bootwedge's startblk for the non-GPT case. ok jakllsch@ To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/stand/lib/biosdisk.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/i386/conf
Module Name:src Committed By: ahoka Date: Wed Sep 21 10:18:52 UTC 2011 Added Files: src/sys/arch/i386/conf: MODULAR Log Message: Initial version of a pro-module kernel config To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/vmstat
Module Name:src Committed By: jym Date: Wed Sep 21 12:08:02 UTC 2011 Modified Files: src/usr.bin/vmstat: vmstat.c Log Message: Use __arraycount(), as done above. To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/usr.bin/vmstat/vmstat.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/amiga/dev
Module Name:src Committed By: rkujawa Date: Wed Sep 21 12:40:25 UTC 2011 Modified Files: src/sys/arch/amiga/dev: zbus.c zbusvar.h Log Message: Fix build for both amiga and amigappc (discussed with christos). To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/dev/zbus.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/dev/zbusvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: christos Date: Wed Sep 21 12:48:57 UTC 2011 Modified Files: src/sys/arch/amiga/dev: zbusvar.h Log Message: no parameter names. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/dev/zbusvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga/include
Module Name:src Committed By: rkujawa Date: Wed Sep 21 13:05:32 UTC 2011 Modified Files: src/sys/arch/amiga/include: bus.h Log Message: Remove zbusmap prototype from bus.h (now in zbusvar.h) To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/include/bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: christos Date: Wed Sep 21 14:30:48 UTC 2011 Modified Files: src/usr.bin/make: meta.c Log Message: PR/45383: Henning Petersen: Swapped lseek args To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/meta.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/audio/record
Module Name:src Committed By: christos Date: Wed Sep 21 14:32:14 UTC 2011 Modified Files: src/usr.bin/audio/record: record.c Log Message: PR/45384: Henning Petersen: Swapped arguments in lseek To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/usr.bin/audio/record/record.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/gencat
Module Name:src Committed By: christos Date: Wed Sep 21 14:33:35 UTC 2011 Modified Files: src/usr.bin/gencat: gencat.c Log Message: PR/45385: Henning Petersen: Swapped arguments in lseek To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/usr.bin/gencat/gencat.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/arm/marvell
Module Name:src
Committed By: reinoud
Date: Wed Sep 21 14:38:51 UTC 2011
Modified Files:
src/sys/arch/arm/marvell: mvsoc.c
Log Message:
Add revision 3/A1 of the KIRKWOOD
{ KIRKWOOD(88F6192),3, 88F619x, A1, Kirkwood },
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/marvell/mvsoc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/distrib/ews4800mips/floppies/bootfloppy
Module Name:src Committed By: christos Date: Wed Sep 21 16:13:51 UTC 2011 Modified Files: src/distrib/ews4800mips/floppies/bootfloppy: Makefile Log Message: buildfloppies.sh: Image is 29012 bytes (28 KB) too big to fit on 2 disks So make it 3 floppes until someone finds a way to conserve space. The build has been broken for months. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/ews4800mips/floppies/bootfloppy/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/mips/mips
Module Name:src Committed By: macallan Date: Wed Sep 21 16:37:54 UTC 2011 Modified Files: src/sys/arch/mips/mips: pmap.c Log Message: make the code that deals with mapping regular memory non-cached work again: - honour PMAP_NOCACHE - move the PGC_NOCACHE stuff out of #ifdef PARANOIADIAG we need this to mmap DMA buffers non-cached on sgimips To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/sys/arch/mips/mips/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/kdump
Module Name:src Committed By: christos Date: Wed Sep 21 17:48:53 UTC 2011 Modified Files: src/usr.bin/kdump: Makefile kdump.c Log Message: Symbolic printing of some known MISC records. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/kdump/Makefile cvs rdiff -u -r1.113 -r1.114 src/usr.bin/kdump/kdump.c 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: christos Date: Wed Sep 21 18:10:25 UTC 2011 Modified Files: src/sys/kern: uipc_syscalls.c src/sys/sys: mbuf.h Log Message: Put the mbuf type in the ktrace record so that we know how to decode it in userland. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/kern/uipc_syscalls.c cvs rdiff -u -r1.145 -r1.146 src/sys/sys/mbuf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/mbr/gptmbr
Module Name:src Committed By: jakllsch Date: Wed Sep 21 18:15:59 UTC 2011 Modified Files: src/sys/arch/i386/stand/mbr/gptmbr: Makefile Log Message: Set LOADADDR to 0x600, matches how gptmbr.bin is compiled upstream. This should let this actually work. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/mbr/gptmbr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sup/source
Module Name:src Committed By: christos Date: Wed Sep 21 19:32:59 UTC 2011 Modified Files: src/usr.sbin/sup/source: path.c supextern.h Log Message: constify To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sup/source/path.c cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sup/source/supextern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sup/source
Module Name:src Committed By: christos Date: Wed Sep 21 19:34:54 UTC 2011 Modified Files: src/usr.sbin/sup/source: sup.1 supcdefs.h supcmain.c supcmeat.c supcparse.c Log Message: Add a canonicalize option to avoid disaster when one converts directories to symlinks in the tree and back. This option is expensive, it could be made better by cacheing, but not now. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sup/source/sup.1 cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sup/source/supcdefs.h cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/sup/source/supcmain.c cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/sup/source/supcmeat.c cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sup/source/supcparse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sup/source
Module Name:src Committed By: wiz Date: Wed Sep 21 20:12:12 UTC 2011 Modified Files: src/usr.sbin/sup/source: sup.1 Log Message: New sentence, new line. Remove empty EXAMPLE section. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/sup/source/sup.1 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: jakllsch Date: Thu Sep 22 01:15:31 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL src/sys/dev/acpi: files.acpi Removed Files: src/sys/dev/acpi: valz_acpi.c Log Message: valz(4) is superseded entirely by acpivga(4) these days. To generate a diff of this commit: cvs rdiff -u -r1.319 -r1.320 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.91 -r1.92 src/sys/dev/acpi/files.acpi cvs rdiff -u -r1.3 -r0 src/sys/dev/acpi/valz_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Thu Sep 22 04:22:19 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libgcc/arch: alpha.mk arm.mk armeb.mk m68000.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: c++config.h config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: c++config.h config.h src/external/gpl3/gcc/usr.bin/gcc/arch/alpha: configargs.h defs.mk src/external/gpl3/gcc/usr.bin/gcc/arch/arm: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/armeb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/hppa: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/i386: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/m68000: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/m68k: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sparc: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/vax: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: configargs.h Log Message: regenerate. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/arch/alpha.mk cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libgcc/arch/arm.mk cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/arch/armeb.mk cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgcc/arch/m68000.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/c++config.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/configargs.h \ src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/arm/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/armeb/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/configargs.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/m68000/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/configargs.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips
Module Name:src Committed By: macallan Date: Thu Sep 22 05:08:52 UTC 2011 Modified Files: src/sys/arch/mips/include: cpu.h cpuregs.h mips3_pte.h pmap.h src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c mips_machdep.c pmap.c Log Message: support BUS_SPACE_MAP_PREFETCH in order to allow mapping device memory and DMA buffers with cacheing disabled but things like write combining, relaxed ordering etc. allowed when the CPU supports it so far enabled only on Loongson, should work on R1xk and probably newer CPUs To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mips/include/cpu.h cvs rdiff -u -r1.86 -r1.87 src/sys/arch/mips/include/cpuregs.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/include/mips3_pte.h cvs rdiff -u -r1.60 -r1.61 src/sys/arch/mips/include/pmap.h cvs rdiff -u -r1.15 -r1.16 \ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c cvs rdiff -u -r1.248 -r1.249 src/sys/arch/mips/mips/mips_machdep.c cvs rdiff -u -r1.203 -r1.204 src/sys/arch/mips/mips/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
