CVS commit: src/sys/arch
Module Name:src Committed By: tsutsui Date: Wed Dec 9 12:21:59 UTC 2009 Modified Files: src/sys/arch/amiga/include: param.h src/sys/arch/atari/include: param.h src/sys/arch/cesfic/include: param.h src/sys/arch/hp300/include: param.h src/sys/arch/luna68k/include: param.h src/sys/arch/mac68k/include: param.h src/sys/arch/mvme68k/include: param.h src/sys/arch/news68k/include: param.h src/sys/arch/next68k/include: param.h src/sys/arch/x68k/include: param.h Log Message: Fix wrong NBSEG values for all hp300 pmap derived m68k ports. They were incorrect since 1997 on amiga and atari, and since 2002 on other ports, but fortunately they don't look so fatal. Anyway, these values will be moved into m68k/pmap_motorola.h soon since they are quite pmap implementation dependent. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amiga/include/param.h cvs rdiff -u -r1.31 -r1.32 src/sys/arch/atari/include/param.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cesfic/include/param.h cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hp300/include/param.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/include/param.h cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mac68k/include/param.h cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mvme68k/include/param.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/news68k/include/param.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/next68k/include/param.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x68k/include/param.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/param.h diff -u src/sys/arch/amiga/include/param.h:1.45 src/sys/arch/amiga/include/param.h:1.46 --- src/sys/arch/amiga/include/param.h:1.45 Sun Jan 6 18:50:32 2008 +++ src/sys/arch/amiga/include/param.h Wed Dec 9 12:21:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.45 2008/01/06 18:50:32 mhitch Exp $ */ +/* $NetBSD: param.h,v 1.46 2009/12/09 12:21:58 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -89,10 +89,10 @@ #define KERNBASE 0x /* start of kernel virtual */ #define SEGSHIFT 24 /* LOG2(NBSEG) [68030 value] */ -/* bytes/segment */ -/* (256 * (1 PGSHIFT)) == (1 SEGSHIFT) */ -#define NBSEG ((mmutype == MMU_68040) \ - ? (32 * (1 PGSHIFT)) : (256 * (1 PGSHIFT))) + +#define NBSEG ((mmutype == MMU_68040) ? \ + (1 18 /* SG4_SHIFT2 */) : (1 SEGSHIFT)) + /* bytes/segment */ #define SEGOFSET (NBSEG-1) /* byte offset into segment */ #define UPAGES 2 /* pages of u-area */ Index: src/sys/arch/atari/include/param.h diff -u src/sys/arch/atari/include/param.h:1.31 src/sys/arch/atari/include/param.h:1.32 --- src/sys/arch/atari/include/param.h:1.31 Thu Jan 3 01:02:04 2008 +++ src/sys/arch/atari/include/param.h Wed Dec 9 12:21:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.31 2008/01/03 01:02:04 joerg Exp $ */ +/* $NetBSD: param.h,v 1.32 2009/12/09 12:21:58 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -89,10 +89,10 @@ #define KERNBASE 0x /* start of kernel virtual */ #define SEGSHIFT 24 /* LOG2(NBSEG) [68030 value] */ -/* bytes/segment */ -/* (256 * (1 PGSHIFT)) == (1 SEGSHIFT) */ + #define NBSEG ((mmutype == MMU_68040) \ - ? (32 * (1 PGSHIFT)) : (256 * (1 PGSHIFT))) + ? (1 18 /* SG4_SHIFT2 */) : (1 SEGSHIFT)) + /* bytes/segment */ #define SEGOFSET (NBSEG-1) /* byte offset into segment */ #define UPAGES 2 /* pages of u-area */ Index: src/sys/arch/cesfic/include/param.h diff -u src/sys/arch/cesfic/include/param.h:1.8 src/sys/arch/cesfic/include/param.h:1.9 --- src/sys/arch/cesfic/include/param.h:1.8 Sat Mar 14 14:45:58 2009 +++ src/sys/arch/cesfic/include/param.h Wed Dec 9 12:21:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.8 2009/03/14 14:45:58 dsl Exp $ */ +/* $NetBSD: param.h,v 1.9 2009/12/09 12:21:58 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -101,10 +101,10 @@ #if defined(M68030) !defined(M68040) !defined(M68060) #define NBSEG (1 SEGSHIFT) /* bytes/segment */ #elif (defined(M68040) || defined(M68060)) !defined(M68030) -#define NBSEG (32 * (1 PGSHIFT)) +#define NBSEG (1 18 /* SG4_SHIFT2 */) #else #define NBSEG ((mmutype == MMU_68040) ? \ -(32 * (1 PGSHIFT)) : (256 * (1 PGSHIFT))) + (1 18 /* SG4_SHIFT2 */) : (1 SEGSHIFT)) #endif #define SEGOFSET (NBSEG-1) /* byte offset into segment */ Index: src/sys/arch/hp300/include/param.h diff -u src/sys/arch/hp300/include/param.h:1.49 src/sys/arch/hp300/include/param.h:1.50 --- src/sys/arch/hp300/include/param.h:1.49 Mon Dec 31 13:38:50 2007 +++ src/sys/arch/hp300/include/param.h Wed Dec 9 12:21:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.49 2007/12/31 13:38:50 ad Exp $ */ +/* $NetBSD: param.h,v 1.50 2009/12/09 12:21:58 tsutsui Exp $ */
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src Committed By: he Date: Wed Dec 9 12:43:00 UTC 2009 Modified Files: src/sys/arch/arm/s3c2xx0: sscom.c Log Message: Make this one build again. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/s3c2xx0/sscom.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/s3c2xx0/sscom.c diff -u src/sys/arch/arm/s3c2xx0/sscom.c:1.31 src/sys/arch/arm/s3c2xx0/sscom.c:1.32 --- src/sys/arch/arm/s3c2xx0/sscom.c:1.31 Sun Dec 6 21:35:05 2009 +++ src/sys/arch/arm/s3c2xx0/sscom.c Wed Dec 9 12:42:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sscom.c,v 1.31 2009/12/06 21:35:05 dyoung Exp $ */ +/* $NetBSD: sscom.c,v 1.32 2009/12/09 12:42:59 he Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -98,7 +98,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.31 2009/12/06 21:35:05 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: sscom.c,v 1.32 2009/12/09 12:42:59 he Exp $); #include opt_sscom.h #include opt_ddb.h @@ -511,6 +511,8 @@ int sscom_detach(device_t self, int flags) { + struct sscom_softc *sc = device_private(self); + if (sc-sc_hwflags (SSCOM_HW_CONSOLE|SSCOM_HW_KGDB)) return EBUSY; @@ -520,7 +522,9 @@ int sscom_activate(device_t self, enum devact act) { +#ifdef notyet struct sscom_softc *sc = device_private(self); +#endif switch (act) { case DVACT_DEACTIVATE:
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Wed Dec 9 15:38:07 UTC 2009 Modified Files: src/sys/rump/librump/rumpvfs: Makefile.rumpvfs Log Message: Since rumpfs is no longer a module, remove rump_module from the list of sources. This, in a rather curious twist of linker magic, broke anything using rump file systems when librumpvfs was compiled with LIBDPLIBS pointing to librump. Thanks to the several people who reported the problem, and especially Arnaud Ysmal for noticing the paramount symptom that components compiled in src/lib did not work while ones compiled in sys/rump/librump did work. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.21 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.22 --- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.21 Fri Nov 27 17:54:24 2009 +++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Wed Dec 9 15:38:07 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rumpvfs,v 1.21 2009/11/27 17:54:24 pooka Exp $ +# $NetBSD: Makefile.rumpvfs,v 1.22 2009/12/09 15:38:07 pooka Exp $ # .include ${RUMPTOP}/Makefile.rump @@ -17,7 +17,7 @@ # SRCS= rump_vfs.c devnodes.c rumpblk.c rumpfs.c vm_vfs.c -SRCS+= fstrans_stub.c vfsops_stub.c rump_module.c +SRCS+= fstrans_stub.c vfsops_stub.c SRCS+= rumpvfs_if_wrappers.c
CVS commit: othersrc/lib/libfsu_mount
Module Name:othersrc Committed By: stacktic Date: Wed Dec 9 16:33:02 UTC 2009 Modified Files: othersrc/lib/libfsu_mount: fsu_mount.c fsu_mount.h Log Message: Removed useless strdup and global vars To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 othersrc/lib/libfsu_mount/fsu_mount.c cvs rdiff -u -r1.3 -r1.4 othersrc/lib/libfsu_mount/fsu_mount.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/lib/libfsu_mount/fsu_mount.c diff -u othersrc/lib/libfsu_mount/fsu_mount.c:1.13 othersrc/lib/libfsu_mount/fsu_mount.c:1.14 --- othersrc/lib/libfsu_mount/fsu_mount.c:1.13 Thu Dec 3 15:00:38 2009 +++ othersrc/lib/libfsu_mount/fsu_mount.c Wed Dec 9 16:33:02 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fsu_mount.c,v 1.13 2009/12/03 15:00:38 pooka Exp $ */ +/* $NetBSD: fsu_mount.c,v 1.14 2009/12/09 16:33:02 stacktic Exp $ */ /* * Copyright (c) 2008,2009 Arnaud Ysmal. All Rights Reserved. @@ -67,14 +67,14 @@ #define __UNCONST(a) ((char *)(unsigned long)(const char *)(a)) #endif -#define ADD_ARG(a) \ +#define ADD_ARG(m, a) \ do { \ char *_tmp = (a);\ if ((_tmp) == NULL) { \ warn(NULL);\ return NULL;\ } \ - mntd.mntd_argv[mntd.mntd_argc++] = (_tmp); \ + (m)-mntd_argv[(m)-mntd_argc++] = (_tmp); \ } while (0/*CONSTCOND*/) struct mount_data_s { fsu_fs_t *mntd_fs; @@ -86,13 +86,12 @@ int mntd_argv_size; char *mntd_cwd; }; -static struct mount_data_s mntd; -static struct ukfs *mount_alias(struct fsu_fsalias_s *, char *, char *); -static struct ukfs *mount_fstype(fsu_fs_t *, char *, char *, char *, char *); -static struct ukfs *mount_struct(_Bool); -static char *fsdevice, *fstype; -static _Bool fsu_blockfs = false; +static struct ukfs *mount_alias(struct fsu_fsalias_s *, char *, char *, +struct mount_data_s *); +static struct ukfs *mount_fstype(fsu_fs_t *, const char *, char *, char *, +char *, struct mount_data_s *); +static struct ukfs *mount_struct(_Bool, struct mount_data_s *); _Bool fsu_readonly = false; @@ -100,15 +99,17 @@ * Tries to mount an image. * if the fstype is not given try every supported types. */ -struct ukfs -*fsu_mount(int *argc, char **argv[]) +struct ukfs * +fsu_mount(int *argc, char **argv[]) { struct ukfs *ukfs; fsu_fs_t *fst; struct fsu_fsalias_s *alias; + struct mount_data_s mntd; int idx; char ch, *mntopts, afsdev[MAXPATHLEN], *path, *puffsexec, *specopts; char *tmp; + const char *fsdevice, *fstype; struct stat sb; #ifdef WITH_SYSPUFFS const char options[] = f:o:p:s:t:; @@ -117,37 +118,26 @@ #endif alias = NULL; - puffsexec = specopts = mntopts = fstype = fsdevice = NULL; + puffsexec = specopts = mntopts = NULL; fst = NULL; ukfs = NULL; + memset(mntd, 0, sizeof(mntd)); ukfs_init(); ukfs_modload_dir(RUMP_LIBDIR); /* - * [-o mnt_args] [[-t] fstype] [ -p puffsexec] fsdevice + * [-o mnt_args] [-t fstype] [-p puffsexec] fsdevice */ while ((ch = getopt(*argc, *argv, options)) != -1) { switch (ch) { case 'f': - if (fsdevice == NULL) { -if (stat(optarg, sb) == 0 -realpath(optarg, afsdev) != NULL) { - fsdevice = strdup(afsdev); -fsu_blockfs = true; -} else - fsdevice = strdup(optarg); -if (fsdevice == NULL) { - warn(NULL); - return NULL; -} - } + if (fsdevice == NULL) +fsdevice = optarg; break; case 'o': - if (mntopts == NULL) { + if (mntopts == NULL) mntopts = optarg; -setenv(FSU_MNTOPTS, optarg, 1); - } break; #ifdef WITH_SYSPUFFS case 'p': @@ -158,15 +148,11 @@ break; if (fstype == NULL) - fstype = strdup(MOUNT_PUFFS); + fstype = MOUNT_PUFFS; else if (strcmp(fstype, MOUNT_PUFFS) != 0) { warnx(-p is only for puffs); return NULL; } -if (fstype == NULL) { - warn(NULL); - return NULL; -} } break; #endif @@ -176,11 +162,7 @@ break; case 't': if (fstype == NULL) -fstype = strdup(optarg); - if (fstype == NULL) { -warn(NULL); -return NULL; - } +fstype = optarg; break; case '?': default: @@ -229,49 +211,36 @@ if (fsdevice == NULL) { fsdevice = getenv(FSU_DEVICE); if (fsdevice == NULL) { - if (idx *argc strcmp((*argv)[idx], --) != 0) { -if (stat((*argv)[idx], sb) == 0 -realpath((*argv)[idx], afsdev) != NULL) { - fsdevice = strdup(afsdev); -fsu_blockfs = true; - ++idx; -} else - fsdevice = strdup((*argv)[idx++]); -if (fsdevice == NULL) { - warn(NULL); - return NULL; -} - } else { + if (idx *argc strcmp((*argv)[idx], --) != 0) +fsdevice = (*argv)[idx++]; + else { errno = 0; return
CVS commit: src/gnu/lib/libgcc4/libgcov
Module Name:src Committed By: uebayasi Date: Wed Dec 9 17:30:14 UTC 2009 Modified Files: src/gnu/lib/libgcc4/libgcov: Makefile Log Message: Fix inverted condition in previous. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/gnu/lib/libgcc4/libgcov/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/lib/libgcc4/libgcov/Makefile diff -u src/gnu/lib/libgcc4/libgcov/Makefile:1.6 src/gnu/lib/libgcc4/libgcov/Makefile:1.7 --- src/gnu/lib/libgcc4/libgcov/Makefile:1.6 Wed Dec 9 06:20:14 2009 +++ src/gnu/lib/libgcc4/libgcov/Makefile Wed Dec 9 17:30:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/12/09 06:20:14 uebayasi Exp $ +# $NetBSD: Makefile,v 1.7 2009/12/09 17:30:14 uebayasi Exp $ REQUIRETOOLS= yes NOPIC= # defined @@ -9,7 +9,7 @@ .include bsd.own.mk -.if defined(MKNATIVE_LIBGCC_NEW) ${MKGCC} != no +.if !defined(MKNATIVE_LIBGCC_NEW) ${MKGCC} != no .include ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: joerg Date: Wed Dec 9 18:06:08 UTC 2009 Modified Files: src/lib/libc/stdio: getdelim.3 Log Message: Fix markup. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/stdio/getdelim.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/getdelim.3 diff -u src/lib/libc/stdio/getdelim.3:1.6 src/lib/libc/stdio/getdelim.3:1.7 --- src/lib/libc/stdio/getdelim.3:1.6 Tue Dec 1 08:15:50 2009 +++ src/lib/libc/stdio/getdelim.3 Wed Dec 9 18:06:08 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getdelim.3,v 1.6 2009/12/01 08:15:50 wiz Exp $ +.\ $NetBSD: getdelim.3,v 1.7 2009/12/09 18:06:08 joerg Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -110,6 +110,7 @@ if (ferror(fp)) perror(getline); +.Ed .Sh ERRORS .Bl -tag -width [EOVERFLOW] .It Bq Er EINVAL
CVS commit: src/sys/sys
Module Name:src Committed By: drochner Date: Wed Dec 9 20:26:12 UTC 2009 Modified Files: src/sys/sys: signal.h Log Message: fix the signature of struct sigevent:sigev_notify_function, noticed by BaiYang per PR lib/42434 the sad truth is that this doesn't help much because SIGEV_THREAD just doesn't work (at least on -current, likely on -5, perhaps it worked woth scheduler activations) To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/sys/signal.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/signal.h diff -u src/sys/sys/signal.h:1.64 src/sys/sys/signal.h:1.65 --- src/sys/sys/signal.h:1.64 Wed Feb 27 22:18:41 2008 +++ src/sys/sys/signal.h Wed Dec 9 20:26:12 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: signal.h,v 1.64 2008/02/27 22:18:41 hubertf Exp $ */ +/* $NetBSD: signal.h,v 1.65 2009/12/09 20:26:12 drochner Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1991, 1993 @@ -215,14 +215,16 @@ int sigev_notify; int sigev_signo; union sigval sigev_value; - void (*sigev_notify_function)(union sigval *); + void (*sigev_notify_function)(union sigval); void /* pthread_attr_t */ *sigev_notify_attributes; }; #define SIGEV_NONE 0 #define SIGEV_SIGNAL 1 #define SIGEV_THREAD 2 +#if defined(_NETBSD_SOURCE) #define SIGEV_SA 3 +#endif #endif /* (_POSIX_C_SOURCE - 0) = 199309L || ... */ #endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE */
CVS commit: src/sys
Module Name:src Committed By: dsl Date: Wed Dec 9 21:33:00 UTC 2009 Modified Files: src/sys/arch/xen/xen: xenevt.c src/sys/compat/svr4: svr4_net.c src/sys/compat/svr4_32: svr4_32_net.c src/sys/dev/dmover: dmover_io.c src/sys/dev/putter: putter.c src/sys/kern: kern_descrip.c kern_drvctl.c kern_event.c sys_mqueue.c sys_pipe.c sys_socket.c uipc_socket.c vfs_vnops.c src/sys/net: bpf.c if_tap.c src/sys/opencrypto: cryptodev.c src/sys/sys: file.h socketvar.h Log Message: Rename fo_drain() to fo_abort(), 'drain' is used to mean 'wait for output do drain' in many places, whereas fo_drain() was called in order to force blocking read()/write() etc calls to return to userspace so that a close() call from a different thread can complete. In the sockets code comment out the broken code in the inner function, it was being called from compat code. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/xen/xen/xenevt.c cvs rdiff -u -r1.56 -r1.57 src/sys/compat/svr4/svr4_net.c cvs rdiff -u -r1.19 -r1.20 src/sys/compat/svr4_32/svr4_32_net.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/dmover/dmover_io.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/putter/putter.c cvs rdiff -u -r1.200 -r1.201 src/sys/kern/kern_descrip.c cvs rdiff -u -r1.29 -r1.30 src/sys/kern/kern_drvctl.c cvs rdiff -u -r1.66 -r1.67 src/sys/kern/kern_event.c cvs rdiff -u -r1.26 -r1.27 src/sys/kern/sys_mqueue.c cvs rdiff -u -r1.120 -r1.121 src/sys/kern/sys_pipe.c cvs rdiff -u -r1.61 -r1.62 src/sys/kern/sys_socket.c cvs rdiff -u -r1.194 -r1.195 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.166 -r1.167 src/sys/kern/vfs_vnops.c cvs rdiff -u -r1.148 -r1.149 src/sys/net/bpf.c cvs rdiff -u -r1.60 -r1.61 src/sys/net/if_tap.c cvs rdiff -u -r1.49 -r1.50 src/sys/opencrypto/cryptodev.c cvs rdiff -u -r1.68 -r1.69 src/sys/sys/file.h cvs rdiff -u -r1.121 -r1.122 src/sys/sys/socketvar.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/xen/xen/xenevt.c diff -u src/sys/arch/xen/xen/xenevt.c:1.34 src/sys/arch/xen/xen/xenevt.c:1.35 --- src/sys/arch/xen/xen/xenevt.c:1.34 Mon Oct 19 18:41:11 2009 +++ src/sys/arch/xen/xen/xenevt.c Wed Dec 9 21:32:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: xenevt.c,v 1.34 2009/10/19 18:41:11 bouyer Exp $ */ +/* $NetBSD: xenevt.c,v 1.35 2009/12/09 21:32:58 dsl Exp $ */ /* * Copyright (c) 2005 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xenevt.c,v 1.34 2009/10/19 18:41:11 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: xenevt.c,v 1.35 2009/12/09 21:32:58 dsl Exp $); #include opt_xen.h #include sys/param.h @@ -81,7 +81,7 @@ .fo_stat = fbadop_stat, .fo_close = xenevt_fclose, .fo_kqfilter = /* xenevt_fkqfilter */ fnullop_kqfilter, - .fo_drain = fnullop_drain, + .fo_abort = fnullop_abort, }; dev_type_open(xenevtopen); Index: src/sys/compat/svr4/svr4_net.c diff -u src/sys/compat/svr4/svr4_net.c:1.56 src/sys/compat/svr4/svr4_net.c:1.57 --- src/sys/compat/svr4/svr4_net.c:1.56 Sat Apr 4 10:12:51 2009 +++ src/sys/compat/svr4/svr4_net.c Wed Dec 9 21:32:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_net.c,v 1.56 2009/04/04 10:12:51 ad Exp $ */ +/* $NetBSD: svr4_net.c,v 1.57 2009/12/09 21:32:58 dsl Exp $ */ /*- * Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: svr4_net.c,v 1.56 2009/04/04 10:12:51 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: svr4_net.c,v 1.57 2009/12/09 21:32:58 dsl Exp $); #define COMPAT_SVR4 1 @@ -108,7 +108,7 @@ .fo_stat = soo_stat, .fo_close = svr4_soo_close, .fo_kqfilter = soo_kqfilter, - .fo_drain = soo_drain, + .fo_abort = soo_abort, }; Index: src/sys/compat/svr4_32/svr4_32_net.c diff -u src/sys/compat/svr4_32/svr4_32_net.c:1.19 src/sys/compat/svr4_32/svr4_32_net.c:1.20 --- src/sys/compat/svr4_32/svr4_32_net.c:1.19 Sat Apr 4 10:12:51 2009 +++ src/sys/compat/svr4_32/svr4_32_net.c Wed Dec 9 21:32:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_net.c,v 1.19 2009/04/04 10:12:51 ad Exp $ */ +/* $NetBSD: svr4_32_net.c,v 1.20 2009/12/09 21:32:58 dsl Exp $ */ /*- * Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: svr4_32_net.c,v 1.19 2009/04/04 10:12:51 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: svr4_32_net.c,v 1.20 2009/12/09 21:32:58 dsl Exp $); #define COMPAT_SVR4 1 @@ -102,7 +102,7 @@ .fo_poll = soo_poll, .fo_stat = soo_stat, .fo_close = svr4_soo_close, - .fo_drain = soo_drain, + .fo_abort = soo_abort, }; Index: src/sys/dev/dmover/dmover_io.c diff -u src/sys/dev/dmover/dmover_io.c:1.35 src/sys/dev/dmover/dmover_io.c:1.36 --- src/sys/dev/dmover/dmover_io.c:1.35 Fri May 1 00:15:57 2009 +++ src/sys/dev/dmover/dmover_io.c Wed Dec 9 21:32:58 2009 @@ -1,4 +1,4 @@
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Wed Dec 9 22:10:51 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: packet-print.c ssh2pgp.c Log Message: Minor change (benign everywhere else) to pick up the asprintf(3) prototype on Linux - caught by Alan Horn. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.21 src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.22 --- src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.21 Sat Dec 5 07:08:19 2009 +++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c Wed Dec 9 22:10:51 2009 @@ -58,10 +58,13 @@ #if defined(__NetBSD__) __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.); -__RCSID($NetBSD: packet-print.c,v 1.21 2009/12/05 07:08:19 agc Exp $); +__RCSID($NetBSD: packet-print.c,v 1.22 2009/12/09 22:10:51 agc Exp $); #endif #include string.h + +/* this brings in the prototype for asprintf on Linux */ +#define _GNU_SOURCE #include stdio.h #ifdef HAVE_UNISTD_H Index: src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.3 src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.4 --- src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c:1.3 Sun Dec 6 17:43:05 2009 +++ src/crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c Wed Dec 9 22:10:51 2009 @@ -37,7 +37,11 @@ #include sys/param.h #include inttypes.h + +/* this brings in the prototype for asprintf on Linux */ +#define _GNU_SOURCE #include stdio.h + #include stdlib.h #include string.h
CVS commit: [matt-nb5-mips64] src/gnu/lib/libobjc4/arch/mips64eb
Module Name:src Committed By: mrg Date: Thu Dec 10 02:11:38 UTC 2009 Added Files: src/gnu/lib/libobjc4/arch/mips64eb [matt-nb5-mips64]: config.h defs.mk Log Message: add these generated files. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/gnu/lib/libobjc4/arch/mips64eb/config.h \ src/gnu/lib/libobjc4/arch/mips64eb/defs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/gnu/lib/libobjc4/arch/mips64eb/config.h diff -u /dev/null src/gnu/lib/libobjc4/arch/mips64eb/config.h:1.1.2.1 --- /dev/null Thu Dec 10 02:11:38 2009 +++ src/gnu/lib/libobjc4/arch/mips64eb/config.h Thu Dec 10 02:11:38 2009 @@ -0,0 +1,63 @@ +/* This file is automatically generated. DO NOT EDIT! */ +/* Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp */ +/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp */ + +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if the compiler has a thread header that is non single. */ +#define HAVE_GTHR_DEFAULT 1 + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the sched.h header file. */ +#define HAVE_SCHED_H 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#define PACKAGE_NAME package-unused + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING package-unused version-unused + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME libobjc + +/* Define to the version of this package. */ +#define PACKAGE_VERSION version-unused + +/* Define if the compiler is configured for setjmp/longjmp exceptions. */ +/* #undef SJLJ_EXCEPTIONS */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 Index: src/gnu/lib/libobjc4/arch/mips64eb/defs.mk diff -u /dev/null src/gnu/lib/libobjc4/arch/mips64eb/defs.mk:1.1.2.1 --- /dev/null Thu Dec 10 02:11:38 2009 +++ src/gnu/lib/libobjc4/arch/mips64eb/defs.mk Thu Dec 10 02:11:38 2009 @@ -0,0 +1,10 @@ +# This file is automatically generated. DO NOT EDIT! +# Generated from: NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp +# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp +# +G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/mips/mips.opt +G_ALL_CFLAGS=-I. -I${GNUHOSTDIST}/libobjc -O2 -W -Wall -Wwrite-strings -Wstrict-prototypes -DIN_GCC -DIN_TARGET_LIBS -fno-strict-aliasing -fexceptions +G_INCLUDES=-I${GNUHOSTDIST}/libobjc/objc -I${GNUHOSTDIST}/libobjc/../gcc -I${GNUHOSTDIST}/libobjc/../gcc/config -I../.././gcc -I${GNUHOSTDIST}/libobjc/../include +G_OBJS=archive.lo class.lo encoding.lo gc.lo hash.lo init.lo linking.lo misc.lo nil_method.lo NXConstStr.lo Object.lo objects.lo Protocol.lo sarray.lo selector.lo sendmsg.lo thr.lo thr-objc.lo exception.lo hash_compat.lo +G_OBJC_H=hash.h objc-list.h sarray.h objc.h objc-api.h NXConstStr.h Object.h Protocol.h encoding.h typedstream.h thr.h objc-decls.h +G_UNWIND_H=${GNUHOSTDIST}/gcc/unwind-generic.h
CVS commit: src/distrib/sets
Module Name:src Committed By: uebayasi Date: Thu Dec 10 02:22:57 UTC 2009 Modified Files: src/distrib/sets: maketars Log Message: sh(1) style. No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/maketars Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/maketars diff -u src/distrib/sets/maketars:1.72 src/distrib/sets/maketars:1.73 --- src/distrib/sets/maketars:1.72 Sat Dec 5 15:56:25 2009 +++ src/distrib/sets/maketars Thu Dec 10 02:22:57 2009 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: maketars,v 1.72 2009/12/05 15:56:25 cegger Exp $ +# $NetBSD: maketars,v 1.73 2009/12/10 02:22:57 uebayasi Exp $ # # Make release tar files for some or all lists. Usage: # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir] @@ -162,7 +162,7 @@ ${HOST_SH} ${setsdir}/makeflist -a ${MACHINE_ARCH} -m ${MACHINE} \ -s ${setsdir} ${setname} ${SDIR}/flist.${setname} \ || exit 1 - if ! [ -s ${SDIR}/flist.${setname} ]; then + if [ ! -s ${SDIR}/flist.${setname} ]; then echo 2 makeflist output is empty for ${setname} exit 1 fi
CVS commit: src/distrib/sets
Module Name:src Committed By: uebayasi Date: Thu Dec 10 05:02:48 UTC 2009 Modified Files: src/distrib/sets: sets.subr Log Message: MKZFS is properly set in bsd.own.mk now; remove it from MKEXTRAVARS. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/sets.subr diff -u src/distrib/sets/sets.subr:1.103 src/distrib/sets/sets.subr:1.104 --- src/distrib/sets/sets.subr:1.103 Thu Dec 3 18:26:34 2009 +++ src/distrib/sets/sets.subr Thu Dec 10 05:02:48 2009 @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.103 2009/12/03 18:26:34 uebayasi Exp $ +# $NetBSD: sets.subr,v 1.104 2009/12/10 05:02:48 uebayasi Exp $ # # @@ -32,7 +32,6 @@ MKDYNAMICROOT \ MKMANPAGES \ MKXORG \ - MKZFS \ USE_INET6 \ USE_KERBEROS \ USE_LDAP \ @@ -220,7 +219,7 @@ # In each file, a record consists of a path and a System Package name, # separated by whitespace. E.g., # -# # $NetBSD: sets.subr,v 1.103 2009/12/03 18:26:34 uebayasi Exp $ +# # $NetBSD: sets.subr,v 1.104 2009/12/10 05:02:48 uebayasi Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root
CVS commit: src/distrib/sets
Module Name:src Committed By: uebayasi Date: Thu Dec 10 05:15:28 UTC 2009 Modified Files: src/distrib/sets: Makefile sets.subr Log Message: Add print_mkvars make target for debug. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/Makefile cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/Makefile diff -u src/distrib/sets/Makefile:1.73 src/distrib/sets/Makefile:1.74 --- src/distrib/sets/Makefile:1.73 Fri Dec 4 12:43:56 2009 +++ src/distrib/sets/Makefile Thu Dec 10 05:15:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2009/12/04 12:43:56 apb Exp $ +# $NetBSD: Makefile,v 1.74 2009/12/10 05:15:28 uebayasi Exp $ # The `all' target must appear before bsd.own.mk is pulled in. all: @@ -67,6 +67,9 @@ print_toolchain_missing: .PHONY @echo ${TOOLCHAIN_MISSING} +print_mkvars: .PHONY + @env SETS_SUBR_DEBUG=dumpmkvars sh sets.subr + # # METALOG MANIPULATION TARGETS # Index: src/distrib/sets/sets.subr diff -u src/distrib/sets/sets.subr:1.104 src/distrib/sets/sets.subr:1.105 --- src/distrib/sets/sets.subr:1.104 Thu Dec 10 05:02:48 2009 +++ src/distrib/sets/sets.subr Thu Dec 10 05:15:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.104 2009/12/10 05:02:48 uebayasi Exp $ +# $NetBSD: sets.subr,v 1.105 2009/12/10 05:15:28 uebayasi Exp $ # # @@ -168,7 +168,6 @@ EOMAKE ); do -# echo 12 DEBUG: read $x eval $x done @@ -176,6 +175,15 @@ MKVARS=$MKEXTRAVARS $_MKVARS_yes $_MKVARS_no +if [ $SETS_SUBR_DEBUG = dumpmkvars ]; then + for v in $MKVARS; do + eval echo $v=\$$v + done + exit 0 +fi + +# + setsdir=${0%/*} obsolete=0 module=yes @@ -219,7 +227,7 @@ # In each file, a record consists of a path and a System Package name, # separated by whitespace. E.g., # -# # $NetBSD: sets.subr,v 1.104 2009/12/10 05:02:48 uebayasi Exp $ +# # $NetBSD: sets.subr,v 1.105 2009/12/10 05:15:28 uebayasi Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root
CVS commit: src/distrib/sets
Module Name:src Committed By: uebayasi Date: Thu Dec 10 05:57:23 UTC 2009 Modified Files: src/distrib/sets: Makefile Log Message: sh - ${HOST_SH} To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/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/sets/Makefile diff -u src/distrib/sets/Makefile:1.74 src/distrib/sets/Makefile:1.75 --- src/distrib/sets/Makefile:1.74 Thu Dec 10 05:15:28 2009 +++ src/distrib/sets/Makefile Thu Dec 10 05:57:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2009/12/10 05:15:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.75 2009/12/10 05:57:23 uebayasi Exp $ # The `all' target must appear before bsd.own.mk is pulled in. all: @@ -68,7 +68,7 @@ @echo ${TOOLCHAIN_MISSING} print_mkvars: .PHONY - @env SETS_SUBR_DEBUG=dumpmkvars sh sets.subr + @env SETS_SUBR_DEBUG=dumpmkvars ${HOST_SH} sets.subr # # METALOG MANIPULATION TARGETS
CVS commit: src/sys/lib/libkern/arch/hppa
Module Name:src Committed By: skrll Date: Thu Dec 10 07:57:02 UTC 2009 Modified Files: src/sys/lib/libkern/arch/hppa: bcopy.S Log Message: Rename L_ADDR to L_PCB To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/lib/libkern/arch/hppa/bcopy.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/hppa/bcopy.S diff -u src/sys/lib/libkern/arch/hppa/bcopy.S:1.9 src/sys/lib/libkern/arch/hppa/bcopy.S:1.10 --- src/sys/lib/libkern/arch/hppa/bcopy.S:1.9 Tue Dec 1 09:06:17 2009 +++ src/sys/lib/libkern/arch/hppa/bcopy.S Thu Dec 10 07:57:02 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bcopy.S,v 1.9 2009/12/01 09:06:17 skrll Exp $ */ +/* $NetBSD: bcopy.S,v 1.10 2009/12/10 07:57:02 skrll Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #include machine/reg.h #if defined(LIBC_SCCS) !defined(lint) -RCSID($NetBSD: bcopy.S,v 1.9 2009/12/01 09:06:17 skrll Exp $) +RCSID($NetBSD: bcopy.S,v 1.10 2009/12/10 07:57:02 skrll Exp $) #endif /* LIBC_SCCS and not lint */ /* @@ -515,7 +515,7 @@ Lspcopy_curlwp_ok: #endif /* DIAGNOSTIC */ ldilL%spcopy_fault, %r1 - ldw L_ADDR(%r31), %r31 + ldw L_PCB(%r31), %r31 ldo R%spcopy_fault(%r1), %r1 ldi EFAULT, %ret0 stw %r1, PCB_ONFAULT(%r31)