Re: CVS commit: src/usr.bin/config
Log Message: Introduce experimental support for ioconf-only configuration files. This is done by giving the ioconf keyword in the config file. As a result, config produces only ioconf.c and locators.h. Currently, only monolithic configurations with the device path starting from root are supported. Eventually, the goal is to support a local root in the input file from any point along the device tree using files.* in our kernel tree. This will make autogenerating the config glue for device modules possible instead of having to write it by hand like is currently required (yes, it sounds simple to implement, but ...). reviewed by cube. (the next part will demand major discussions with you, so prepare ;) What's the next step? I'm considering to move cfdata[] and *_iattrdata to each driver's *.c. Maybe split ioconf.c (like ioconf_cfdriver_decl_audio.c) and #include it from *.c (audio.c). In the long run, the template part is always statically generated. Direct configuration / user configuration parts are read from / at run-time. Masao
Re: CVS commit: src/usr.bin/config
On Mon Mar 01 2010 at 17:28:15 +0900, Masao Uebayashi wrote: Log Message: Introduce experimental support for ioconf-only configuration files. This is done by giving the ioconf keyword in the config file. As a result, config produces only ioconf.c and locators.h. Currently, only monolithic configurations with the device path starting from root are supported. Eventually, the goal is to support a local root in the input file from any point along the device tree using files.* in our kernel tree. This will make autogenerating the config glue for device modules possible instead of having to write it by hand like is currently required (yes, it sounds simple to implement, but ...). reviewed by cube. (the next part will demand major discussions with you, so prepare ;) What's the next step? I'm considering to move cfdata[] and *_iattrdata to each driver's *.c. Maybe split ioconf.c (like ioconf_cfdriver_decl_audio.c) and #include it from *.c (audio.c). In the long run, the template part is always statically generated. Direct configuration / user configuration parts are read from / at run-time. My next step is to make the above work without having start from root (done) and autogenerate the source file list (done apart from some testing). Truthfully though, my next step is to have coffee.
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: roy
Date: Mon Mar 1 11:02:32 UTC 2010
Modified Files:
src/lib/libterminfo: termcap.c
Log Message:
Escape , when converting to terminfo.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/termcap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/termcap.c
diff -u src/lib/libterminfo/termcap.c:1.3 src/lib/libterminfo/termcap.c:1.4
--- src/lib/libterminfo/termcap.c:1.3 Fri Feb 26 00:09:00 2010
+++ src/lib/libterminfo/termcap.c Mon Mar 1 11:02:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap.c,v 1.3 2010/02/26 00:09:00 roy Exp $ */
+/* $NetBSD: termcap.c,v 1.4 2010/03/01 11:02:31 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: termcap.c,v 1.3 2010/02/26 00:09:00 roy Exp $);
+__RCSID($NetBSD: termcap.c,v 1.4 2010/03/01 11:02:31 roy Exp $);
#include assert.h
#include ctype.h
@@ -243,6 +243,12 @@
if (l + 2 len)
goto elen;
if (*val != '%') {
+ if (*val == ',') {
+if (l + 3 len)
+ goto elen;
+*ip++ = '\\';
+l++;
+ }
*ip++ = *val;
l++;
continue;
CVS commit: src/lib/libterminfo
Module Name:src Committed By: roy Date: Mon Mar 1 11:02:32 UTC 2010 Modified Files: src/lib/libterminfo: termcap.c Log Message: Escape , when converting to terminfo. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/termcap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: darran Date: Mon Mar 1 11:19:41 UTC 2010 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_impl.h dt_module.c dt_pid.c dt_proc.c src/external/cddl/osnet/sys/sys: cpuvar.h elf.h modctl.h policy.h sdt.h types.h src/sys/sys: Makefile exec_elf.h Removed Files: src/external/cddl/osnet/dist/uts/common/sys: sdt.h Log Message: DTrace: fix a few problems introduced by the recent ZFS update (expected problems from the OpenSolaris merge). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c cvs rdiff -u -r1.1.1.2 -r0 src/external/cddl/osnet/dist/uts/common/sys/sdt.h cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/cpuvar.h \ src/external/cddl/osnet/sys/sys/elf.h \ src/external/cddl/osnet/sys/sys/modctl.h \ src/external/cddl/osnet/sys/sys/policy.h cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/sdt.h cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/types.h cvs rdiff -u -r1.123 -r1.124 src/sys/sys/Makefile cvs rdiff -u -r1.100 -r1.101 src/sys/sys/exec_elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: darran
Date: Mon Mar 1 11:19:41 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_impl.h
dt_module.c dt_pid.c dt_proc.c
src/external/cddl/osnet/sys/sys: cpuvar.h elf.h modctl.h policy.h sdt.h
types.h
src/sys/sys: Makefile exec_elf.h
Removed Files:
src/external/cddl/osnet/dist/uts/common/sys: sdt.h
Log Message:
DTrace: fix a few problems introduced by the recent ZFS update (expected
problems from the OpenSolaris merge).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/cddl/osnet/dist/uts/common/sys/sdt.h
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/cpuvar.h \
src/external/cddl/osnet/sys/sys/elf.h \
src/external/cddl/osnet/sys/sys/modctl.h \
src/external/cddl/osnet/sys/sys/policy.h
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/sdt.h
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/types.h
cvs rdiff -u -r1.123 -r1.124 src/sys/sys/Makefile
cvs rdiff -u -r1.100 -r1.101 src/sys/sys/exec_elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h:1.3 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h:1.4
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h:1.3 Sat Feb 27 23:43:52 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h Mon Mar 1 11:19:40 2010
@@ -40,7 +40,6 @@
#include libctf.h
#include dtrace.h
#include gelf.h
-#include synch.h
#ifdef __cplusplus
extern C {
@@ -600,6 +599,19 @@
extern uint64_t dt_stddev(uint64_t *, uint64_t);
+#define DT_MUTEX_HELD(x) dt_mutex_held(x)
+
+static inline int
+dt_mutex_held(pthread_mutex_t *lock)
+{
+#if defined(sun)
+ extern int _mutex_held(struct _lwp_mutex *);
+ return (_mutex_held((struct _lwp_mutex *)lock));
+#else
+ return (1);
+#endif
+}
+
extern int dt_options_load(dtrace_hdl_t *);
extern void dt_dprintf(const char *, ...);
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.4 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.5
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.4 Sat Feb 27 23:43:52 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c Mon Mar 1 11:19:40 2010
@@ -23,6 +23,10 @@
* Use is subject to license terms.
*/
+#ifndef ELFSIZE
+#define ELFSIZE ARCH_ELFSIZE
+#endif
+
#include sys/types.h
#if defined(sun)
#include sys/modctl.h
@@ -79,7 +83,7 @@
#if STT_NUM != (STT_TLS + 1)
#error STT_NUM has grown. update dt_module_syminit32()
#endif
- const Elf32_Sym *sym = dmp-dm_symtab.cts_data;
+ Elf32_Sym *sym = dmp-dm_symtab.cts_data;
const char *base = dmp-dm_strtab.cts_data;
size_t ss_size = dmp-dm_strtab.cts_size;
uint_t i, n = dmp-dm_nsymelems;
@@ -116,7 +120,7 @@
#if STT_NUM != (STT_TLS + 1)
#error STT_NUM has grown. update dt_module_syminit64()
#endif
- const Elf64_Sym *sym = dmp-dm_symtab.cts_data;
+ Elf64_Sym *sym = dmp-dm_symtab.cts_data;
const char *base = dmp-dm_strtab.cts_data;
size_t ss_size = dmp-dm_strtab.cts_size;
uint_t i, n = dmp-dm_nsymelems;
@@ -494,7 +498,7 @@
Elf_Data *dp;
Elf_Scn *sp;
- if (elf_getshdrstrndx(dmp-dm_elf, shstrs) == -1)
+ if (elf_getshstrndx(dmp-dm_elf, shstrs) == 0)
return (dt_set_errno(dtp, EDT_NOTLOADED));
for (sp = NULL; (sp = elf_nextscn(dmp-dm_elf, sp)) != NULL; ) {
@@ -900,7 +904,7 @@
(void) close(fd);
if (dmp-dm_elf == NULL || err == -1 ||
- elf_getshdrstrndx(dmp-dm_elf, shstrs) == -1) {
+ elf_getshstrndx(dmp-dm_elf, shstrs) == 0) {
dt_dprintf(failed to load %s: %s\n,
fname, elf_errmsg(elf_errno()));
dt_module_destroy(dtp, dmp);
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c:1.4 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c:1.5
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c:1.4 Sat Feb 27 23:43:52 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c Mon Mar 1 11:19:41 2010
@@ -694,7 +694,7 @@
struct ps_prochandle *P = dpr-dpr_proc;
int ret = 0;
- assert(MUTEX_HELD(dpr-dpr_lock));
+ assert(DT_MUTEX_HELD(dpr-dpr_lock));
#ifdef DOODAD
(void) Pupdate_maps(P);
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c:1.4
CVS commit: src/sys/sys
Module Name:src Committed By: darran Date: Mon Mar 1 11:25:05 UTC 2010 Modified Files: src/sys/sys: Makefile Log Message: Backout accidental commit adding sdt.h (hold off until CTF toolchain build is ready). To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/sys/sys/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/sys/Makefile diff -u src/sys/sys/Makefile:1.124 src/sys/sys/Makefile:1.125 --- src/sys/sys/Makefile:1.124 Mon Mar 1 11:19:41 2010 +++ src/sys/sys/Makefile Mon Mar 1 11:25:05 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.124 2010/03/01 11:19:41 darran Exp $ +# $NetBSD: Makefile,v 1.125 2010/03/01 11:25:05 darran Exp $ .include bsd.sys.mk @@ -29,7 +29,7 @@ queue.h \ ras.h rb.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \ rnd.h rwlock.h sa.h satypes.h \ - scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h sha1.h \ + scanio.h sched.h scsiio.h select.h selinfo.h sem.h sha1.h \ sha2.h shm.h siginfo.h signal.h signalvar.h sigtypes.h simplelock.h \ sleepq.h socket.h \ socketvar.h sockio.h specificdata.h stat.h statvfs.h \
CVS commit: src/sys/sys
Module Name:src Committed By: darran Date: Mon Mar 1 11:25:05 UTC 2010 Modified Files: src/sys/sys: Makefile Log Message: Backout accidental commit adding sdt.h (hold off until CTF toolchain build is ready). To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/sys/sys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Mon Mar 1 11:27:30 UTC 2010 Modified Files: src/sys/sys: exec_elf.h Log Message: Use #definetab consistently. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/sys/exec_elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Mon Mar 1 11:27:30 UTC 2010 Modified Files: src/sys/sys: exec_elf.h Log Message: Use #definetab consistently. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/sys/exec_elf.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/exec_elf.h diff -u src/sys/sys/exec_elf.h:1.101 src/sys/sys/exec_elf.h:1.102 --- src/sys/sys/exec_elf.h:1.101 Mon Mar 1 11:19:41 2010 +++ src/sys/sys/exec_elf.h Mon Mar 1 11:27:29 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: exec_elf.h,v 1.101 2010/03/01 11:19:41 darran Exp $ */ +/* $NetBSD: exec_elf.h,v 1.102 2010/03/01 11:27:29 skrll Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -490,8 +490,8 @@ #define STT_FUNC 2 /* Associated with a function */ #define STT_SECTION 3 /* Associated with a section */ #define STT_FILE 4 /* Associated with a file name */ -#define STT_COMMON 5 /* Uninitialised common block */ -#define STT_TLS 6 /* Thread local data object */ +#define STT_COMMON 5 /* Uninitialised common block */ +#define STT_TLS 6 /* Thread local data object */ #define STT_NUM 7 #define STT_LOOS 10 /* Operating system specific range */
CVS commit: src/sys/rump/dev/lib/libucom
Module Name:src Committed By: pooka Date: Mon Mar 1 11:34:27 UTC 2010 Modified Files: src/sys/rump/dev/lib/libucom: Makefile UCOM.ioconf ucom_at_usb.c Log Message: add u3g To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libucom/Makefile \ src/sys/rump/dev/lib/libucom/UCOM.ioconf cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libucom/ucom_at_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Mon Mar 1 13:03:30 UTC 2010 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: support unmount of rumpfs To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Mon Mar 1 13:03:30 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
support unmount of rumpfs
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/rump/librump/rumpvfs/rumpfs.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/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.36 src/sys/rump/librump/rumpvfs/rumpfs.c:1.37
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.36 Thu Dec 3 12:54:30 2009
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Mar 1 13:03:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.36 2009/12/03 12:54:30 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.37 2010/03/01 13:03:30 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.36 2009/12/03 12:54:30 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.37 2010/03/01 13:03:30 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -821,6 +821,10 @@
rumpfs_unmount(struct mount *mp, int flags)
{
+ /* if going for it, just lie about it */
+ if (panicstr)
+ return 0;
+
return EOPNOTSUPP; /* ;) */
}
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Mar 1 13:12:21 UTC 2010 Modified Files: src/sys/rump: ldscript.rump src/sys/rump/dev/lib: Makefile.inc src/sys/rump/dev/lib/libbpf: component.c src/sys/rump/dev/lib/libcgd: component.c src/sys/rump/dev/lib/libdm: component.c src/sys/rump/dev/lib/libnetsmb: component.c src/sys/rump/dev/lib/libraidframe: component.c src/sys/rump/dev/lib/librnd: component.c src/sys/rump/dev/lib/libsysmon: component.c src/sys/rump/dev/lib/libucom: ucom_at_usb.c src/sys/rump/dev/lib/libulpt: ulpt_at_usb.c src/sys/rump/dev/lib/libumass: sd_at_scsibus_at_umass.c src/sys/rump/dev/lib/libwscons: component.c src/sys/rump/include/rump: rumpuser.h src/sys/rump/librump/rumpdev: rump_dev.c rump_dev_private.h src/sys/rump/librump/rumpkern: rump.c rump_private.h src/sys/rump/librump/rumpnet: rump_net.c rump_net_private.h src/sys/rump/net/lib: Makefile.inc src/sys/rump/net/lib/liblocal: component.c src/sys/rump/net/lib/libnet: component.c src/sys/rump/net/lib/libnetinet: component.c src/sys/rump/net/lib/libsockin: component.c src/sys/rump/net/lib/libvirtif: component.c Log Message: Introduce RUMP_COMPONENT. It behaves mostly like a simplified module which is linked into the kernel and cannot be unloaded. The main purpose is to get the proper constructors run and create any /dev nodes necessary for said component. Once more of the kernel (e.g. networking stack and device drivers) are converted to MODULE and devfs pops up from somewhere, rump components can be retired. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/ldscript.rump cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libbpf/component.c cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libcgd/component.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libdm/component.c cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libnetsmb/component.c cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libraidframe/component.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/librnd/component.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libsysmon/component.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libucom/ucom_at_usb.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c cvs rdiff -u -r1.1 -r1.2 \ src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libwscons/component.c cvs rdiff -u -r1.36 -r1.37 src/sys/rump/include/rump/rumpuser.h cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpdev/rump_dev.c cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpdev/rump_dev_private.h cvs rdiff -u -r1.153 -r1.154 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.42 -r1.43 src/sys/rump/librump/rumpkern/rump_private.h cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpnet/rump_net.c cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpnet/rump_net_private.h cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/lib/Makefile.inc cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/liblocal/component.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnet/component.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnetinet/component.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libsockin/component.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libvirtif/component.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Mon Mar 1 13:13:48 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser_dl.c
Log Message:
Introduce RUMP_COMPONENT. It behaves mostly like a simplified
module which is linked into the kernel and cannot be unloaded.
The main purpose is to get the proper constructors run and create
any /dev nodes necessary for said component. Once more of the
kernel (e.g. networking stack and device drivers) are converted to
MODULE and devfs pops up from somewhere, rump components can be
retired.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/rumpuser_dl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.1 src/lib/librumpuser/rumpuser_dl.c:1.2
--- src/lib/librumpuser/rumpuser_dl.c:1.1 Fri Feb 26 18:54:20 2010
+++ src/lib/librumpuser/rumpuser_dl.c Mon Mar 1 13:13:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_dl.c,v 1.1 2010/02/26 18:54:20 pooka Exp $ */
+/* $NetBSD: rumpuser_dl.c,v 1.2 2010/03/01 13:13:48 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_dl.c,v 1.1 2010/02/26 18:54:20 pooka Exp $);
+__RCSID($NetBSD: rumpuser_dl.c,v 1.2 2010/03/01 13:13:48 pooka Exp $);
#include sys/types.h
#include sys/time.h
@@ -402,6 +402,46 @@
couldload = 1;
} while (couldload);
}
+
+void
+rumpuser_dl_component_init(int type, rump_component_init_fn compinit)
+{
+ struct link_map *map;
+
+ if (dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, map) == -1) {
+ fprintf(stderr, warning: rumpuser module bootstrap
+ failed: %s\n, dlerror());
+ return;
+ }
+
+ for (; map-l_next; map = map-l_next)
+ continue;
+ for (; map; map = map-l_prev) {
+ if (strstr(map-l_name, librump) != NULL) {
+ void *handle;
+ struct rump_component **rc, **rc_end;
+
+ handle = dlopen(map-l_name, RTLD_LAZY);
+ if (handle == NULL)
+continue;
+
+ rc = dlsym(handle,
+ __start_link_set_rump_components);
+ if (!rc)
+goto loop;
+ rc_end = dlsym(handle,
+ __stop_link_set_rump_components);
+ if (!rc_end)
+goto loop;
+
+ for (; rc rc_end; rc++)
+compinit(*rc, type);
+ assert(rc == rc_end);
+ loop:
+ dlclose(handle);
+ }
+ }
+}
#else
void
rumpuser_dl_bootstrap(rump_modinit_fn domodinit,
@@ -410,4 +450,11 @@
fprintf(stderr, Warning, dlinfo() unsupported on host?\n);
}
+
+void
+rumpuser_dl_component_init(int type, rump_component_init_fn compinit)
+{
+
+ fprintf(stderr, Warning, dlinfo() unsupported on host?\n);
+}
#endif
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Mon Mar 1 13:16:22 UTC 2010 Modified Files: src/sys/dev/acpi: smbus_acpi.c Log Message: Destroy the callout(9) when detaching. Also evaluate the removal of the notify handler before going to demolishing business. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/smbus_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Mon Mar 1 13:16:22 UTC 2010
Modified Files:
src/sys/dev/acpi: smbus_acpi.c
Log Message:
Destroy the callout(9) when detaching. Also evaluate the removal of the
notify handler before going to demolishing business.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/smbus_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/smbus_acpi.c
diff -u src/sys/dev/acpi/smbus_acpi.c:1.2 src/sys/dev/acpi/smbus_acpi.c:1.3
--- src/sys/dev/acpi/smbus_acpi.c:1.2 Mon Mar 1 05:37:37 2010
+++ src/sys/dev/acpi/smbus_acpi.c Mon Mar 1 13:16:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: smbus_acpi.c,v 1.2 2010/03/01 05:37:37 jruoho Exp $ */
+/* $NetBSD: smbus_acpi.c,v 1.3 2010/03/01 13:16:21 jruoho Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbus_acpi.c,v 1.2 2010/03/01 05:37:37 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbus_acpi.c,v 1.3 2010/03/01 13:16:21 jruoho Exp $);
#include sys/param.h
#include sys/systm.h
@@ -274,18 +274,16 @@
struct acpi_smbus_softc *sc = device_private(self);
ACPI_STATUS rv;
- pmf_device_deregister(self);
-
- callout_halt(sc-sc_callout, NULL);
-
rv = AcpiRemoveNotifyHandler(sc-sc_devnode-ad_handle,
ACPI_DEVICE_NOTIFY, acpi_smbus_notify_handler);
- if (ACPI_FAILURE(rv)) {
- aprint_error_dev(self,
- unable to deregister DEVICE NOTIFY handler: %s\n,
- AcpiFormatException(rv));
+
+ if (ACPI_FAILURE(rv))
return EBUSY;
- }
+
+ pmf_device_deregister(self);
+
+ callout_halt(sc-sc_callout, NULL);
+ callout_destroy(sc-sc_callout);
mutex_destroy(sc-sc_i2c_mutex);
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Mon Mar 1 13:44:10 UTC 2010 Modified Files: src/share/man/man3: Makefile Added Files: src/share/man/man3: __UNCONST.3 Log Message: Document __UNCONST and __UNVOLATILE. XXX: If there is anything to add or correct, please do so! To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/__UNCONST.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src
Committed By: jruoho
Date: Mon Mar 1 13:44:10 UTC 2010
Modified Files:
src/share/man/man3: Makefile
Added Files:
src/share/man/man3: __UNCONST.3
Log Message:
Document __UNCONST and __UNVOLATILE.
XXX: If there is anything to add or correct, please do so!
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/share/man/man3/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man3/__UNCONST.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man3/Makefile
diff -u src/share/man/man3/Makefile:1.36 src/share/man/man3/Makefile:1.37
--- src/share/man/man3/Makefile:1.36 Sat Feb 27 22:04:38 2010
+++ src/share/man/man3/Makefile Mon Mar 1 13:44:09 2010
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.36 2010/02/27 22:04:38 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/03/01 13:44:09 jruoho Exp $
# @(#)Makefile 8.2 (Berkeley) 12/13/93
-MAN= _DIAGASSERT.3 CMSG_DATA.3 \
+MAN= _DIAGASSERT.3 __UNCONST.3 CMSG_DATA.3 \
assert.3 bits.3 bitstring.3 dlfcn.3 end.3 \
gcq.3 intro.3 offsetof.3 queue.3 stdarg.3 sysexits.3 \
timeradd.3 tree.3 varargs.3
USETBL= # used by queue.3
+MLINKS+=__UNCONST.3 __UNVOLATILE.3
MLINKS+=bitstring.3 bit_alloc.3 \
bitstring.3 bit_clear.3 \
bitstring.3 bit_decl.3 \
Added files:
Index: src/share/man/man3/__UNCONST.3
diff -u /dev/null src/share/man/man3/__UNCONST.3:1.1
--- /dev/null Mon Mar 1 13:44:10 2010
+++ src/share/man/man3/__UNCONST.3 Mon Mar 1 13:44:09 2010
@@ -0,0 +1,90 @@
+.\ $NetBSD: __UNCONST.3,v 1.1 2010/03/01 13:44:09 jruoho Exp $
+.\
+.\ Copyright (c) 2010 The NetBSD Foundation, Inc.
+.\ All rights reserved.
+.\
+.\ This code is derived from software contributed to The NetBSD Foundation
+.\ by Jukka Ruohonen.
+.\
+.\ Redistribution and use in source and binary forms, with or without
+.\ modification, are permitted provided that the following conditions
+.\ are met:
+.\ 1. Redistributions of source code must retain the above copyright
+.\notice, this list of conditions and the following disclaimer.
+.\ 2. Redistributions in binary form must reproduce the above copyright
+.\notice, this list of conditions and the following disclaimer in the
+.\documentation and/or other materials provided with the distribution.
+.\
+.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\ POSSIBILITY OF SUCH DAMAGE.
+.\
+.Dd February 28, 2010
+.Os
+.Dt __UNCONST 3
+.Sh NAME
+.Nm __UNCONST
+.Nd compile time cast-away macro
+.Sh SYNOPSIS
+.In sys/cdefs.h
+.Ft void
+.Fn __UNCONST x
+.Ft void
+.Fn __UNVOLATILE x
+.Sh DESCRIPTION
+The
+.Fn __UNCONST
+macro can be used to omit warnings produced by certain compilers when
+a pointer declared with the
+.Em const
+type qualifier is being passed to a function without such qualifier.
+In the same vein, the
+.Fn __UNVOLATILE
+macro can be used to omit warnings related to the
+.Em volatile
+type qualifier.
+.Pp
+.Sh IMPLEMENTATION NOTES
+Both macros are implemented by explicitly using
+.Em unsigned long
+instead of
+.Em intptr_t ,
+a signed type guaranteed to hold a pointer.
+.Sh EXAMPLES
+The following example demonstrates a possible usage of
+.Fn __UNCONST :
+.Bd -literal -offset indent
+const char *str = /dev/null;
+
+api_function(__UNCONST(str));
+
+\...
+
+static void
+api_function(char *str)
+{
+ \...
+
+.Ed
+.Sh CAVEATS
+Both macros should be used with care because these can hide valid errors.
+A typical use case for
+.Fn __UNCONST
+involve an
+.Tn API
+that does not follow the so-called ``const correctness''
+even if it would be appropriate.
+Valid use cases of
+.Fn __UNVOLATILE
+include passing a volatile pointer to
+.Xr memset 3 .
+.Sh SEE ALSO
+.Xr cc 1
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 13:45:54 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add __UNCONST(3). To generate a diff of this commit: cvs rdiff -u -r1.1395 -r1.1396 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 13:45:54 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add __UNCONST(3). To generate a diff of this commit: cvs rdiff -u -r1.1395 -r1.1396 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1395 src/distrib/sets/lists/comp/mi:1.1396 --- src/distrib/sets/lists/comp/mi:1.1395 Sat Feb 27 22:04:37 2010 +++ src/distrib/sets/lists/comp/mi Mon Mar 1 13:45:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1395 2010/02/27 22:04:37 wiz Exp $ +# $NetBSD: mi,v 1.1396 2010/03/01 13:45:54 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4727,6 +4727,8 @@ ./usr/share/man/cat3/__SHIFTIN.0 comp-c-catman .cat ./usr/share/man/cat3/__SHIFTOUT.0 comp-c-catman .cat ./usr/share/man/cat3/__SHIFTOUT_MASK.0 comp-c-catman .cat +./usr/share/man/cat3/__UNCONST.0 comp-c-catman .cat +./usr/share/man/cat3/__UNVOLATILE.0 comp-c-catman .cat ./usr/share/man/cat3/__builtin_object_size.0 comp-c-catman .cat ./usr/share/man/cat3/__svc_getcallercreds.0 comp-c-catman .cat ./usr/share/man/cat3/_longjmp.0 comp-c-catman .cat @@ -10538,6 +10540,8 @@ ./usr/share/man/html3/__SHIFTIN.html comp-c-htmlman html ./usr/share/man/html3/__SHIFTOUT.html comp-c-htmlman html ./usr/share/man/html3/__SHIFTOUT_MASK.html comp-c-htmlman html +./usr/share/man/html3/__UNCONST.html comp-c-htmlman html +./usr/share/man/html3/__UNVOLATILE.html comp-c-htmlman html ./usr/share/man/html3/__builtin_object_size.html comp-c-htmlman html ./usr/share/man/html3/__svc_getcallercreds.html comp-c-htmlman html ./usr/share/man/html3/_longjmp.html comp-c-htmlman html @@ -16149,6 +16153,8 @@ ./usr/share/man/man3/__SHIFTIN.3 comp-c-man .man ./usr/share/man/man3/__SHIFTOUT.3 comp-c-man .man ./usr/share/man/man3/__SHIFTOUT_MASK.3 comp-c-man .man +./usr/share/man/man3/__UNCONST.3 comp-c-man .man +./usr/share/man/man3/__UNVOLATILE.3 comp-c-man .man ./usr/share/man/man3/__builtin_object_size.3 comp-c-man .man ./usr/share/man/man3/__svc_getcallercreds.3 comp-c-man .man ./usr/share/man/man3/_longjmp.3 comp-c-man .man
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: oster
Date: Mon Mar 1 14:51:58 UTC 2010
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
Don't merge a good parity map with random stuff in the event that the
first component is missing. (Since the merging just OR's the maps,
this isn't that big of a deal, as it will just over-estimate the
amount of checking that needs to be done.)
To generate a diff of this commit:
cvs rdiff -u -r1.271 -r1.272 src/sys/dev/raidframe/rf_netbsdkintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.271 src/sys/dev/raidframe/rf_netbsdkintf.c:1.272
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.271 Tue Dec 1 01:03:54 2009
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Mon Mar 1 14:51:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.271 2009/12/01 01:03:54 dyoung Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.272 2010/03/01 14:51:58 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.271 2009/12/01 01:03:54 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.272 2010/03/01 14:51:58 oster Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -2610,8 +2610,9 @@
rf_paritymap_kern_read(RF_Raid_t *raidPtr, struct rf_paritymap_ondisk *map)
{
struct rf_paritymap_ondisk tmp;
- int c;
+ int c,first;
+ first=1;
for (c = 0; c raidPtr-numCol; c++) {
/* Skip dead disks. */
if (RF_DEAD_DISK(raidPtr-Disks[c].status))
@@ -2620,8 +2621,9 @@
raidPtr-raid_cinfo[c].ci_vp, tmp,
RF_PARITYMAP_NBYTE,
RF_PARITY_MAP_OFFSET, RF_PARITY_MAP_SIZE);
- if (c == 0) {
+ if (first) {
memcpy(map, tmp, sizeof(*map));
+ first = 0;
} else {
rf_paritymap_merge(map, tmp);
}
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: oster Date: Mon Mar 1 14:51:58 UTC 2010 Modified Files: src/sys/dev/raidframe: rf_netbsdkintf.c Log Message: Don't merge a good parity map with random stuff in the event that the first component is missing. (Since the merging just OR's the maps, this isn't that big of a deal, as it will just over-estimate the amount of checking that needs to be done.) To generate a diff of this commit: cvs rdiff -u -r1.271 -r1.272 src/sys/dev/raidframe/rf_netbsdkintf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Mar 1 15:28:42 UTC 2010 Modified Files: src/share/man/man4: ne.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/ne.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ne.4 diff -u src/share/man/man4/ne.4:1.12 src/share/man/man4/ne.4:1.13 --- src/share/man/man4/ne.4:1.12 Mon Mar 1 14:16:39 2010 +++ src/share/man/man4/ne.4 Mon Mar 1 15:28:42 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ne.4,v 1.12 2010/03/01 14:16:39 tsutsui Exp $ +.\ $NetBSD: ne.4,v 1.13 2010/03/01 15:28:42 wiz Exp $ .\ .\ Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -67,7 +67,8 @@ .Sh MEDIA SELECTION The Realtek 8019 (ISA, ISAPnP, some PCMCIA) and Realtek 8029 (PCI) NE2000-compatible Ethernet chips include support for software media -selection. If one of these chips is detected by the driver, the list +selection. +If one of these chips is detected by the driver, the list of supported media will be displayed. .Pp For all other chips supported by the
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Mar 1 15:28:42 UTC 2010 Modified Files: src/share/man/man4: ne.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/ne.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Mon Mar 1 15:30:47 UTC 2010 Modified Files: src/share/man/man3: __UNCONST.3 Log Message: Sort SEE ALSO. Remove unnecessary Pp. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/__UNCONST.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Mon Mar 1 15:30:47 UTC 2010 Modified Files: src/share/man/man3: __UNCONST.3 Log Message: Sort SEE ALSO. Remove unnecessary Pp. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/__UNCONST.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/__UNCONST.3 diff -u src/share/man/man3/__UNCONST.3:1.1 src/share/man/man3/__UNCONST.3:1.2 --- src/share/man/man3/__UNCONST.3:1.1 Mon Mar 1 13:44:09 2010 +++ src/share/man/man3/__UNCONST.3 Mon Mar 1 15:30:47 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: __UNCONST.3,v 1.1 2010/03/01 13:44:09 jruoho Exp $ +.\ $NetBSD: __UNCONST.3,v 1.2 2010/03/01 15:30:47 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -51,7 +51,6 @@ macro can be used to omit warnings related to the .Em volatile type qualifier. -.Pp .Sh IMPLEMENTATION NOTES Both macros are implemented by explicitly using .Em unsigned long @@ -74,6 +73,8 @@ \... .Ed +.Sh SEE ALSO +.Xr cc 1 .Sh CAVEATS Both macros should be used with care because these can hide valid errors. A typical use case for @@ -86,5 +87,3 @@ .Fn __UNVOLATILE include passing a volatile pointer to .Xr memset 3 . -.Sh SEE ALSO -.Xr cc 1
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Mar 1 15:41:16 UTC 2010
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/dev/lib/libucom: Makefile
src/sys/rump/dev/lib/libulpt: Makefile
src/sys/rump/dev/lib/libumass: Makefile
src/sys/rump/dev/wip/libukbd: Makefile
src/sys/rump/dev/wip/libums: Makefile
Log Message:
Rename IOCONFIG to IOCONF. It matches the config(1) keyword and
aligns better in Makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libucom/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libulpt/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libukbd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libums/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/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.51 src/sys/rump/Makefile.rump:1.52
--- src/sys/rump/Makefile.rump:1.51 Wed Feb 17 13:28:40 2010
+++ src/sys/rump/Makefile.rump Mon Mar 1 15:41:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.51 2010/02/17 13:28:40 pooka Exp $
+# $NetBSD: Makefile.rump,v 1.52 2010/03/01 15:41:15 pooka Exp $
#
WARNS?= 3 # XXX: src/sys won't compile with -Wsign-compare yet
@@ -102,11 +102,11 @@
${AR} ${_ARRANFL} ${.TARGET}
.endif
-# If IOCONFIG is defined, autocreate ioconf.c and locators.h.
+# If IOCONF is defined, autocreate ioconf.c and locators.h.
# This is useful mainly for devices.
-.if !empty(IOCONFIG)
-ioconf.c: ${IOCONFIG}
- ${TOOL_CONFIG} -b ${.OBJDIR} -s ${RUMPTOP}/.. ${.CURDIR}/${IOCONFIG}
+.if !empty(IOCONF)
+ioconf.c: ${IOCONF}
+ ${TOOL_CONFIG} -b ${.OBJDIR} -s ${RUMPTOP}/.. ${.CURDIR}/${IOCONF}
# config doesn't change the files if they're unchanged. however,
# here we want to satisfy our make dependency, so force a
# timestamp update
Index: src/sys/rump/dev/lib/libucom/Makefile
diff -u src/sys/rump/dev/lib/libucom/Makefile:1.3 src/sys/rump/dev/lib/libucom/Makefile:1.4
--- src/sys/rump/dev/lib/libucom/Makefile:1.3 Mon Mar 1 11:34:27 2010
+++ src/sys/rump/dev/lib/libucom/Makefile Mon Mar 1 15:41:15 2010
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2010/03/01 11:34:27 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/01 15:41:15 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
LIB= rumpdev_ucom
+IOCONF= UCOM.ioconf
SRCS= ucom.c uplcom.c u3g.c
SRCS+= ucom_at_usb.c
SRCS+= tty.c tty_conf.c tty_tty.c tty_subr.c
-IOCONFIG= UCOM.ioconf
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
Index: src/sys/rump/dev/lib/libulpt/Makefile
diff -u src/sys/rump/dev/lib/libulpt/Makefile:1.2 src/sys/rump/dev/lib/libulpt/Makefile:1.3
--- src/sys/rump/dev/lib/libulpt/Makefile:1.2 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/lib/libulpt/Makefile Mon Mar 1 15:41:15 2010
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:45 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/01 15:41:15 pooka Exp $
#
-.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
+.PATH: ${.CURDIR}/../../../../dev/usb
LIB= rumpdev_ulpt
+IOCONF= ULPT.ioconf
SRCS= ulpt.c
SRCS+= ulpt_at_usb.c
-IOCONFIG= ULPT.ioconf
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.4 src/sys/rump/dev/lib/libumass/Makefile:1.5
--- src/sys/rump/dev/lib/libumass/Makefile:1.4 Wed Feb 17 20:44:34 2010
+++ src/sys/rump/dev/lib/libumass/Makefile Mon Mar 1 15:41:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/02/17 20:44:34 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/01 15:41:15 pooka Exp $
#
#
# umass. includes scsibus+sd for simplicity due to the umass code
@@ -8,7 +8,7 @@
.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/scsipi
LIB= rumpdev_umass
-IOCONFIG= UMASS.ioconf
+IOCONF= UMASS.ioconf
.if ${MACHINE} == i386
SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
Index: src/sys/rump/dev/wip/libukbd/Makefile
diff -u src/sys/rump/dev/wip/libukbd/Makefile:1.3 src/sys/rump/dev/wip/libukbd/Makefile:1.4
--- src/sys/rump/dev/wip/libukbd/Makefile:1.3 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/wip/libukbd/Makefile Mon Mar 1 15:41:15 2010
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 20:42:45 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/01 15:41:15 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern \
${.CURDIR}/../../../../dev/wscons
LIB= rumpdev_ukbd
+IOCONF= UKBD.ioconf
SRCS= ukbd.c ukbdmap.c
@@ -14,8 +15,6 @@
# XXX
SRCS+= tty.c tty_conf.c tty_tty.c tty_subr.c
-IOCONFIG= UKBD.ioconf
-
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.include bsd.lib.mk
Index:
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Mar 1 15:41:16 UTC 2010 Modified Files: src/sys/rump: Makefile.rump src/sys/rump/dev/lib/libucom: Makefile src/sys/rump/dev/lib/libulpt: Makefile src/sys/rump/dev/lib/libumass: Makefile src/sys/rump/dev/wip/libukbd: Makefile src/sys/rump/dev/wip/libums: Makefile Log Message: Rename IOCONFIG to IOCONF. It matches the config(1) keyword and aligns better in Makefiles. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/rump/Makefile.rump cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libucom/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libulpt/Makefile cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libumass/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libukbd/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libums/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:02:34 UTC 2010 Modified Files: src/share/man/man3: Makefile Added Files: src/share/man/man3: __arraycount.3 Log Message: Document __arraycount. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/__arraycount.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.37 src/share/man/man3/Makefile:1.38 --- src/share/man/man3/Makefile:1.37 Mon Mar 1 13:44:09 2010 +++ src/share/man/man3/Makefile Mon Mar 1 16:02:34 2010 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2010/03/01 13:44:09 jruoho Exp $ +# $NetBSD: Makefile,v 1.38 2010/03/01 16:02:34 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __UNCONST.3 CMSG_DATA.3 \ - assert.3 bits.3 bitstring.3 dlfcn.3 end.3 \ + __arraycount.3 assert.3 bits.3 bitstring.3 dlfcn.3 end.3 \ gcq.3 intro.3 offsetof.3 queue.3 stdarg.3 sysexits.3 \ timeradd.3 tree.3 varargs.3 Added files: Index: src/share/man/man3/__arraycount.3 diff -u /dev/null src/share/man/man3/__arraycount.3:1.1 --- /dev/null Mon Mar 1 16:02:34 2010 +++ src/share/man/man3/__arraycount.3 Mon Mar 1 16:02:34 2010 @@ -0,0 +1,60 @@ +.\ $NetBSD: __arraycount.3,v 1.1 2010/03/01 16:02:34 jruoho Exp $ +.\ +.\ Copyright (c) 2010 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Jukka Ruohonen. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd March 1, 2010 +.Os +.Dt __arraycount 3 +.Sh NAME +.Nm __arraycount +.Nd macro for statically allocated arrays +.Sh SYNOPSIS +.In sys/cdefs.h +.Ft size_t +.Fn __arraycount x +.Sh DESCRIPTION +The +.Fn __arraycount +macro returns the number of elements in a statically allocated buffer. +.Sh EXAMPLES +The following example demonstrates a possible usage of +.Fn __arraycount : +.Bd -literal -offset indent +uint8_t *buf[BUFSIZE]; +size_t i; + +\... + +for (i = 0; i __arraycount(buf); i++) + \... +.Ed +.Sh HISTORY +The +.Fn __arraycount +macro first appeared in +.Nx 4.0 .
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:02:34 UTC 2010 Modified Files: src/share/man/man3: Makefile Added Files: src/share/man/man3: __arraycount.3 Log Message: Document __arraycount. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/__arraycount.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:03:34 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add __arraycount(3). To generate a diff of this commit: cvs rdiff -u -r1.1396 -r1.1397 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:03:34 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add __arraycount(3). To generate a diff of this commit: cvs rdiff -u -r1.1396 -r1.1397 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1396 src/distrib/sets/lists/comp/mi:1.1397 --- src/distrib/sets/lists/comp/mi:1.1396 Mon Mar 1 13:45:54 2010 +++ src/distrib/sets/lists/comp/mi Mon Mar 1 16:03:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1396 2010/03/01 13:45:54 jruoho Exp $ +# $NetBSD: mi,v 1.1397 2010/03/01 16:03:34 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -4729,6 +4729,7 @@ ./usr/share/man/cat3/__SHIFTOUT_MASK.0 comp-c-catman .cat ./usr/share/man/cat3/__UNCONST.0 comp-c-catman .cat ./usr/share/man/cat3/__UNVOLATILE.0 comp-c-catman .cat +./usr/share/man/cat3/__arraycount.0 comp-c-catman .cat ./usr/share/man/cat3/__builtin_object_size.0 comp-c-catman .cat ./usr/share/man/cat3/__svc_getcallercreds.0 comp-c-catman .cat ./usr/share/man/cat3/_longjmp.0 comp-c-catman .cat @@ -10542,6 +10543,7 @@ ./usr/share/man/html3/__SHIFTOUT_MASK.html comp-c-htmlman html ./usr/share/man/html3/__UNCONST.html comp-c-htmlman html ./usr/share/man/html3/__UNVOLATILE.html comp-c-htmlman html +./usr/share/man/html3/__arraycount.html comp-c-htmlman html ./usr/share/man/html3/__builtin_object_size.html comp-c-htmlman html ./usr/share/man/html3/__svc_getcallercreds.html comp-c-htmlman html ./usr/share/man/html3/_longjmp.html comp-c-htmlman html @@ -16155,6 +16157,7 @@ ./usr/share/man/man3/__SHIFTOUT_MASK.3 comp-c-man .man ./usr/share/man/man3/__UNCONST.3 comp-c-man .man ./usr/share/man/man3/__UNVOLATILE.3 comp-c-man .man +./usr/share/man/man3/__arraycount.3 comp-c-man .man ./usr/share/man/man3/__builtin_object_size.3 comp-c-man .man ./usr/share/man/man3/__svc_getcallercreds.3 comp-c-man .man ./usr/share/man/man3/_longjmp.3 comp-c-man .man
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:36:15 UTC 2010 Modified Files: src/share/man/man3: Makefile Added Files: src/share/man/man3: tgmath.3 Log Message: Add tgmath(3). From FreeBSD. XXX: Needs proofreading, Matt? To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/tgmath.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/Makefile diff -u src/share/man/man3/Makefile:1.38 src/share/man/man3/Makefile:1.39 --- src/share/man/man3/Makefile:1.38 Mon Mar 1 16:02:34 2010 +++ src/share/man/man3/Makefile Mon Mar 1 16:36:15 2010 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.38 2010/03/01 16:02:34 jruoho Exp $ +# $NetBSD: Makefile,v 1.39 2010/03/01 16:36:15 jruoho Exp $ # @(#)Makefile 8.2 (Berkeley) 12/13/93 MAN= _DIAGASSERT.3 __UNCONST.3 CMSG_DATA.3 \ __arraycount.3 assert.3 bits.3 bitstring.3 dlfcn.3 end.3 \ gcq.3 intro.3 offsetof.3 queue.3 stdarg.3 sysexits.3 \ - timeradd.3 tree.3 varargs.3 + tgmath.3 timeradd.3 tree.3 varargs.3 USETBL= # used by queue.3 Added files: Index: src/share/man/man3/tgmath.3 diff -u /dev/null src/share/man/man3/tgmath.3:1.1 --- /dev/null Mon Mar 1 16:36:15 2010 +++ src/share/man/man3/tgmath.3 Mon Mar 1 16:36:15 2010 @@ -0,0 +1,153 @@ +.\ $NetBSD: tgmath.3,v 1.1 2010/03/01 16:36:15 jruoho Exp $ +.\ +.\ Copyright (c) 2004 Stefan Farfeleder +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\ ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE +.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\ SUCH DAMAGE. +.\ +.\ $FreeBSD: src/share/man/man3/tgmath.3,v 1.3 2007/12/15 02:40:10 das Exp $ +.\ +.Dd March 1, 2010 +.Os +.Dt TGMATH 3 +.Sh NAME +.Nm tgmath +.Nd type-generic macros +.Sh SYNOPSIS +.In tgmath.h +.Sh DESCRIPTION +The header +.In tgmath.h +provides type-generic macros +for +.In math.h +and +.In complex.h +functions that have +.Vt float +(suffixed with +.Sy f ) , +.Vt double +and +.Vt long double +(suffixed with +.Sy l ) +versions. +The arguments that vary across the three functions and have type +.Vt float , double +and +.Vt long double , +respectively, are called +.Em generic arguments . +.Pp +The following rules describe which function is actually called if a +type-generic macro is invoked. +If any generic argument has type +.Vt long double +or +.Vt long double complex , +the +.Vt long double +function is called. +Else, if any generic argument has type +.Vt double , double complex +or an integer type, the +.Vt double +version is invoked. +Otherwise, the macro expands to the +.Vt float +implementation. +.Pp +For the macros in the following table, both real and complex functions +exist. +The real functions are prototyped in +.In math.h +and the complex equivalents in +.In complex.h . +The complex function is called if any of the generic arguments is a +complex value. +Otherwise, the real equivalent is called. +.Bl -column -offset indent \ +COMPLEX FUNCTION COMPLEX FUNCTION COMPLEX FUNCTION +.It Sy MACRO Ta Sy REAL FUNCTION Ta Sy COMPLEX FUNCTION +.It Fn acos Ta Fn acos Ta Fn cacos +.It Fn asin Ta Fn asin Ta Fn casin +.It Fn atan Ta Fn atan Ta Fn catan +.It Fn acosh Ta Fn acosh Ta Fn cacosh +.It Fn asinh Ta Fn asinh Ta Fn casinh +.It Fn atanh Ta Fn atanh Ta Fn catanh +.It Fn cos Ta Fn cos Ta Fn ccos +.It Fn sin Ta Fn sin Ta Fn csin +.It Fn tan Ta Fn tan Ta Fn ctan +.It Fn cosh Ta Fn cosh Ta Fn ccosh +.It Fn sinh Ta Fn sinh Ta Fn csinh +.It Fn tanh Ta Fn tanh Ta Fn ctanh +.It Fn exp Ta Fn exp Ta Fn cexp +.It Fn log Ta Fn log Ta Fn clog +.It Fn pow Ta Fn pow Ta Fn cpow +.It Fn sqrt Ta Fn sqrt Ta Fn csqrt +.It Fn fabs Ta Fn fabs Ta Fn cabs +.El +.Pp +No complex functions exist for the following macros,
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:36:15 UTC 2010 Modified Files: src/share/man/man3: Makefile Added Files: src/share/man/man3: tgmath.3 Log Message: Add tgmath(3). From FreeBSD. XXX: Needs proofreading, Matt? To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/share/man/man3/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man3/tgmath.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:37:46 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add tgmath(3). To generate a diff of this commit: cvs rdiff -u -r1.1397 -r1.1398 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1397 src/distrib/sets/lists/comp/mi:1.1398 --- src/distrib/sets/lists/comp/mi:1.1397 Mon Mar 1 16:03:34 2010 +++ src/distrib/sets/lists/comp/mi Mon Mar 1 16:37:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1397 2010/03/01 16:03:34 jruoho Exp $ +# $NetBSD: mi,v 1.1398 2010/03/01 16:37:46 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -8106,6 +8106,7 @@ ./usr/share/man/cat3/tgetflag.0 comp-c-catman .cat ./usr/share/man/cat3/tgetnum.0 comp-c-catman .cat ./usr/share/man/cat3/tgetstr.0 comp-c-catman .cat +./usr/share/man/cat3/tgmath.0 comp-c-catman .cat ./usr/share/man/cat3/tgoto.0 comp-c-catman .cat ./usr/share/man/cat3/threads.0 comp-obsolete obsolete ./usr/share/man/cat3/ti_getflag.0 comp-c-catman .cat @@ -13784,6 +13785,7 @@ ./usr/share/man/html3/tgetflag.html comp-c-htmlman html ./usr/share/man/html3/tgetnum.html comp-c-htmlman html ./usr/share/man/html3/tgetstr.html comp-c-htmlman html +./usr/share/man/html3/tgmath.html comp-c-htmlman html ./usr/share/man/html3/tgoto.html comp-c-htmlman html ./usr/share/man/html3/ti_getflag.html comp-c-htmlman html ./usr/share/man/html3/ti_getnum.html comp-c-htmlman html @@ -19530,6 +19532,7 @@ ./usr/share/man/man3/tgetflag.3 comp-c-man .man ./usr/share/man/man3/tgetnum.3 comp-c-man .man ./usr/share/man/man3/tgetstr.3 comp-c-man .man +./usr/share/man/man3/tgmath.3 comp-c-man .man ./usr/share/man/man3/tgoto.3 comp-c-man .man ./usr/share/man/man3/threads.3 comp-obsolete obsolete ./usr/share/man/man3/ti_getflag.3 comp-c-man .man
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:37:46 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add tgmath(3). To generate a diff of this commit: cvs rdiff -u -r1.1397 -r1.1398 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:52:41 UTC 2010 Modified Files: src/share/man/man7: mailaddr.7 Log Message: Remove dead references to sendmail(8). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man7/mailaddr.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Mon Mar 1 16:52:41 UTC 2010 Modified Files: src/share/man/man7: mailaddr.7 Log Message: Remove dead references to sendmail(8). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man7/mailaddr.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/mailaddr.7 diff -u src/share/man/man7/mailaddr.7:1.13 src/share/man/man7/mailaddr.7:1.14 --- src/share/man/man7/mailaddr.7:1.13 Sun Sep 7 16:22:29 2003 +++ src/share/man/man7/mailaddr.7 Mon Mar 1 16:52:41 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mailaddr.7,v 1.13 2003/09/07 16:22:29 wiz Exp $ +.\ $NetBSD: mailaddr.7,v 1.14 2010/03/01 16:52:41 jruoho Exp $ .\ .\ Copyright (c) 1983, 1987, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -53,7 +53,7 @@ that there is any actual host named ``somedomain.com'', and does not imply a particular routing of the message. Routing is performed by Mail Transport Agents, such as -.Xr sendmail 8 , +.Xr postfix 1 , based on policies set in the MTA's configuration. .Ss Abbreviation Under certain circumstances it may not be necessary to type the entire @@ -81,15 +81,11 @@ All these addressing formats are now considered obsolete, and should no longer be used. .Pp -To some extent, -.Xr sendmail 8 -(when running with normal configuration files) attempts to provide -backward compatibility for these addressing forms, but in practice -many of them no longer work. +To some extent, MTAs attempt to provide backward compatibility +for these addressing forms, but in practice many of them no longer work. Users should always use standard Internet style addresses. .Sh SEE ALSO -.Xr mail 1 , -.Xr sendmail 8 +.Xr mail 1 .Rs .%R RFC .%N 822
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Mon Mar 1 17:06:18 UTC 2010 Modified Files: src/share/man/man3: __arraycount.3 Log Message: Use buf[BUFSIZE] instead of *buf[BUFSIZE] in the example. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/__arraycount.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: jruoho Date: Mon Mar 1 17:06:18 UTC 2010 Modified Files: src/share/man/man3: __arraycount.3 Log Message: Use buf[BUFSIZE] instead of *buf[BUFSIZE] in the example. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/__arraycount.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/__arraycount.3 diff -u src/share/man/man3/__arraycount.3:1.1 src/share/man/man3/__arraycount.3:1.2 --- src/share/man/man3/__arraycount.3:1.1 Mon Mar 1 16:02:34 2010 +++ src/share/man/man3/__arraycount.3 Mon Mar 1 17:06:18 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: __arraycount.3,v 1.1 2010/03/01 16:02:34 jruoho Exp $ +.\ $NetBSD: __arraycount.3,v 1.2 2010/03/01 17:06:18 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -45,7 +45,7 @@ The following example demonstrates a possible usage of .Fn __arraycount : .Bd -literal -offset indent -uint8_t *buf[BUFSIZE]; +uint8_t buf[BUFSIZE]; size_t i; \...
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Mon Mar 1 17:20:44 UTC 2010 Modified Files: src/lib/librumpuser: rumpuser.3 Log Message: Join today's manpage mania by updating this to reflect the current situation a little better. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/rumpuser.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Mon Mar 1 17:20:44 UTC 2010 Modified Files: src/lib/librumpuser: rumpuser.3 Log Message: Join today's manpage mania by updating this to reflect the current situation a little better. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/rumpuser.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/librumpuser/rumpuser.3 diff -u src/lib/librumpuser/rumpuser.3:1.1 src/lib/librumpuser/rumpuser.3:1.2 --- src/lib/librumpuser/rumpuser.3:1.1 Fri Feb 26 18:54:20 2010 +++ src/lib/librumpuser/rumpuser.3 Mon Mar 1 17:20:44 2010 @@ -1,6 +1,6 @@ -.\ $NetBSD: rumpuser.3,v 1.1 2010/02/26 18:54:20 pooka Exp $ +.\ $NetBSD: rumpuser.3,v 1.2 2010/03/01 17:20:44 pooka Exp $ .\ -.\ Copyright (c) 2008 Antti Kantee. All rights reserved. +.\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without .\ modification, are permitted provided that the following conditions @@ -23,28 +23,42 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd July 28, 2008 +.Dd March 1, 2010 .Dt RUMPUSER 3 .Os .Sh NAME .Nm rumpuser -.Nd rump user namespace helper routines +.Nd rump hypervisor interface .Sh LIBRARY rump User Library (librumpuser, \-lrumpuser) .Sh SYNOPSIS .In rump/rumpuser.h .Sh DESCRIPTION .Nm -is a user namespace helper library for runnable userspace meta programs. -From rump emulation code compiled with -.Dv -D_KERNEL -is it not possible to directly call routines such as system calls -for reading and writing files or devices. -This is where +is the hypervisor interface for +.Xr rump 3 +style kernel virtualization. +A virtual rump kernel can make calls to the host operating system +libraries and kernel (system calls) using +.Nm +interfaces. +Any slow hypervisor calls such as file I/O, sychronization wait, +or sleep will cause rump to unschedule the calling kernel thread +from the virtual CPU and free it for other consumers. +When the hypervisor call returns to the kernel, a new scheduling +operation takes place. +.Pp +For example, rump implements kernel threads directly as hypervisor +calls to host +.Xr pthread 3 . +This avoids the common virtualization drawback of multiple overlapping +and possibly conflicting implementations of same functionality in +the software stack. +.Pp +The .Nm -comes into play by providing a bridge between the two namespaces. -Another example of its services is a way to call pthread routines, -used for emulating kernel threads and synchronization mechanisms -in rump. +interface is still under development and interface documentation +is available only in source form from +.Pa src/lib/librumpuser . .Sh SEE ALSO .Xr rump 3
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 17:22:20 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add hztoms(9). To generate a diff of this commit: cvs rdiff -u -r1.1398 -r1.1399 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 17:22:20 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add hztoms(9). To generate a diff of this commit: cvs rdiff -u -r1.1398 -r1.1399 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1398 src/distrib/sets/lists/comp/mi:1.1399 --- src/distrib/sets/lists/comp/mi:1.1398 Mon Mar 1 16:37:46 2010 +++ src/distrib/sets/lists/comp/mi Mon Mar 1 17:22:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1398 2010/03/01 16:37:46 jruoho Exp $ +# $NetBSD: mi,v 1.1399 2010/03/01 17:22:20 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -8957,6 +8957,7 @@ ./usr/share/man/cat9/htole64.0 comp-sys-catman .cat ./usr/share/man/cat9/humanize_number.0 comp-sys-catman .cat ./usr/share/man/cat9/hz.0 comp-sys-catman .cat +./usr/share/man/cat9/hztoms.0 comp-sys-catman .cat ./usr/share/man/cat9/i386/bios32_service.0 comp-sys-catman .cat ./usr/share/man/cat9/i386/bioscall.0 comp-sys-catman .cat ./usr/share/man/cat9/i386/nmi.0 comp-sys-catman .cat @@ -14592,6 +14593,7 @@ ./usr/share/man/html9/htole64.html comp-sys-htmlman html ./usr/share/man/html9/humanize_number.html comp-sys-htmlman html ./usr/share/man/html9/hz.html comp-sys-htmlman html +./usr/share/man/html9/hztoms.html comp-sys-htmlman html ./usr/share/man/html9/i386/bios32_service.html comp-sys-htmlman html ./usr/share/man/html9/i386/bioscall.html comp-sys-htmlman html ./usr/share/man/html9/i386/nmi.html comp-sys-htmlman html @@ -20382,6 +20384,7 @@ ./usr/share/man/man9/htole64.9 comp-sys-man .man ./usr/share/man/man9/humanize_number.9 comp-sys-man .man ./usr/share/man/man9/hz.9 comp-sys-man .man +./usr/share/man/man9/hztoms.9 comp-sys-man .man ./usr/share/man/man9/i386/bios32_service.9 comp-sys-man .man ./usr/share/man/man9/i386/bioscall.9 comp-sys-man .man ./usr/share/man/man9/i386/nmi.9 comp-sys-man .man
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: njoly Date: Mon Mar 1 17:35:21 UTC 2010 Modified Files: src/sys/dev/i2c: i2c.c Log Message: Do initialise i2c_attach_args new members, for indirect configuration too. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/i2c/i2c.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: njoly Date: Mon Mar 1 17:35:21 UTC 2010 Modified Files: src/sys/dev/i2c: i2c.c Log Message: Do initialise i2c_attach_args new members, for indirect configuration too. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/i2c/i2c.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/i2c/i2c.c diff -u src/sys/dev/i2c/i2c.c:1.24 src/sys/dev/i2c/i2c.c:1.25 --- src/sys/dev/i2c/i2c.c:1.24 Sun Feb 28 11:34:42 2010 +++ src/sys/dev/i2c/i2c.c Mon Mar 1 17:35:21 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: i2c.c,v 1.24 2010/02/28 11:34:42 martin Exp $ */ +/* $NetBSD: i2c.c,v 1.25 2010/03/01 17:35:21 njoly Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i2c.c,v 1.24 2010/02/28 11:34:42 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: i2c.c,v 1.25 2010/03/01 17:35:21 njoly Exp $); #include sys/param.h #include sys/systm.h @@ -108,6 +108,10 @@ ia.ia_size = cf-cf_loc[IICCF_SIZE]; ia.ia_type = sc-sc_type; + ia.ia_name = NULL; + ia.ia_ncompat = 0; + ia.ia_compat = NULL; + if (config_match(parent, cf, ia) 0) config_attach(parent, cf, ia, iic_print);
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Mar 1 19:09:42 UTC 2010 Modified Files: src/share/man/man9: Makefile Added Files: src/share/man/man9: setbit.9 Log Message: Document the bitmap related macros in sys/param.h. To generate a diff of this commit: cvs rdiff -u -r1.317 -r1.318 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/setbit.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Mon Mar 1 19:09:42 UTC 2010 Modified Files: src/share/man/man9: Makefile Added Files: src/share/man/man9: setbit.9 Log Message: Document the bitmap related macros in sys/param.h. To generate a diff of this commit: cvs rdiff -u -r1.317 -r1.318 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/setbit.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.317 src/share/man/man9/Makefile:1.318 --- src/share/man/man9/Makefile:1.317 Mon Mar 1 17:21:02 2010 +++ src/share/man/man9/Makefile Mon Mar 1 19:09:41 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.317 2010/03/01 17:21:02 jruoho Exp $ +# $NetBSD: Makefile,v 1.318 2010/03/01 19:09:41 jruoho Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -45,7 +45,7 @@ rt_timer.9 rwlock.9 RUN_ONCE.9 \ sched_4bsd.9 scsipi.9 \ secmodel.9 secmodel_bsd44.9 secmodel_overlay.9 secmodel_securelevel.9 \ - secmodel_suser.9 setjmp.9 shutdownhook_establish.9 \ + secmodel_suser.9 setbit.9 setjmp.9 shutdownhook_establish.9 \ signal.9 sockopt.9 softintr.9 spl.9 splraiseipl.9 \ store.9 suspendsched.9 \ sysctl.9 sysmon_envsys.9 sysmon_pswitch.9 sysmon_taskq.9 tc.9 \ @@ -595,6 +595,9 @@ select.9 seldestroy.9 \ select.9 selrecord.9 \ select.9 selnotify.9 +MLINKS+=setbit.9 clrbit.9 \ + setbit.9 isset.9 \ + setbit.9 isclr.9 MLINKS+=setjmp.9 longjmp.9 MLINKS+=shutdownhook_establish.9 shutdownhook_disestablish.9 MLINKS+=signal.9 siginit.9 \ Added files: Index: src/share/man/man9/setbit.9 diff -u /dev/null src/share/man/man9/setbit.9:1.1 --- /dev/null Mon Mar 1 19:09:42 2010 +++ src/share/man/man9/setbit.9 Mon Mar 1 19:09:41 2010 @@ -0,0 +1,80 @@ +.\ $NetBSD: setbit.9,v 1.1 2010/03/01 19:09:41 jruoho Exp $ +.\ +.\ Copyright (c) 2010 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Jukka Ruohonen. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd March 1, 2010 +.Dt SETBIT 9 +.Os +.Sh NAME +.Nm setbit +.Nd macros related to bitmaps +.Sh SYNOPSIS +.In sys/param.h +.Ft void +.Fn setbit array x +.Ft void +.Fn clrbit array x +.Ft int +.Fn isset array x +.Ft int +.Fn isclr array x +.Sh DESCRIPTION +The +.Nm +family of macros operate with bitmaps, also known as bit arrays. +.Pp +In a nutshell, +.Fn setbit +sets the bit +.Fa x +in +.Fa array , +.Fn clrbit +clears it, +.Fn isset +tests whether +.Fa x +is set, and +.Fn isclr +returns 1 if +.Fa x +is not set. +.Sh EXAMPLES +The following example declares a buffer of 10 chars, +treating it as an array of 80 bits: +.Bd -literal -offset indent +char buf[10]; + +\... + +setbit(buf, 12); /* set the fifth bit in the second byte */ +.Ed +.Sh CAVEATS +The number of valid bits in a given array is assumed to be multiple of +.Dv CHAR_BIT , +the number of bits for smallest object that is not a bit-field.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 19:12:49 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add setbit(9). To generate a diff of this commit: cvs rdiff -u -r1.1399 -r1.1400 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1399 src/distrib/sets/lists/comp/mi:1.1400 --- src/distrib/sets/lists/comp/mi:1.1399 Mon Mar 1 17:22:20 2010 +++ src/distrib/sets/lists/comp/mi Mon Mar 1 19:12:49 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1399 2010/03/01 17:22:20 jruoho Exp $ +# $NetBSD: mi,v 1.1400 2010/03/01 19:12:49 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -8717,6 +8717,7 @@ ./usr/share/man/cat9/clock_secs_to_ymdhms.0 comp-sys-catman .cat ./usr/share/man/cat9/clock_ymdhms_to_secs.0 comp-sys-catman .cat ./usr/share/man/cat9/closef.0 comp-sys-catman .cat +./usr/share/man/cat9/clrbit.0 comp-sys-catman .cat ./usr/share/man/cat9/cltom.0 comp-sys-catman .cat ./usr/share/man/cat9/cn_check_magic.0 comp-sys-catman .cat ./usr/share/man/cat9/cn_destroy_magic.0 comp-sys-catman .cat @@ -9052,6 +9053,8 @@ ./usr/share/man/cat9/isapnp_config.0 comp-sys-catman .cat ./usr/share/man/cat9/isapnp_devmatch.0 comp-sys-catman .cat ./usr/share/man/cat9/isapnp_unconfig.0 comp-sys-catman .cat +./usr/share/man/cat9/isclr.0 comp-sys-catman .cat +./usr/share/man/cat9/isset.0 comp-sys-catman .cat ./usr/share/man/cat9/issignal.0 comp-sys-catman .cat ./usr/share/man/cat9/itimerfix.0 comp-sys-catman .cat ./usr/share/man/cat9/kauth.0 comp-sys-catman .cat @@ -9406,6 +9409,7 @@ ./usr/share/man/cat9/selwakeup.0 comp-obsolete obsolete ./usr/share/man/cat9/sendsig.0 comp-sys-catman .cat ./usr/share/man/cat9/setdisklabel.0 comp-sys-catman .cat +./usr/share/man/cat9/setbit.0 comp-sys-catman .cat ./usr/share/man/cat9/setjmp.0 comp-sys-catman .cat ./usr/share/man/cat9/setrunqueue.0 comp-obsolete obsolete ./usr/share/man/cat9/shutdownhook_disestablish.0 comp-sys-catman .cat @@ -14371,6 +14375,7 @@ ./usr/share/man/html9/clock_secs_to_ymdhms.html comp-sys-htmlman html ./usr/share/man/html9/clock_ymdhms_to_secs.html comp-sys-htmlman html ./usr/share/man/html9/closef.html comp-sys-htmlman html +./usr/share/man/html9/clrbit.html comp-sys-htmlman html ./usr/share/man/html9/cltom.html comp-sys-htmlman html ./usr/share/man/html9/cn_check_magic.html comp-sys-htmlman html ./usr/share/man/html9/cn_destroy_magic.html comp-sys-htmlman html @@ -14688,6 +14693,8 @@ ./usr/share/man/html9/isapnp_config.html comp-sys-htmlman html ./usr/share/man/html9/isapnp_devmatch.html comp-sys-htmlman html ./usr/share/man/html9/isapnp_unconfig.html comp-sys-htmlman html +./usr/share/man/html9/isclr.html comp-sys-htmlman html +./usr/share/man/html9/isset.html comp-sys-htmlman html ./usr/share/man/html9/issignal.html comp-sys-htmlman html ./usr/share/man/html9/itimerfix.html comp-sys-htmlman html ./usr/share/man/html9/kauth.html comp-sys-htmlman html @@ -15020,6 +15027,7 @@ ./usr/share/man/html9/selrecord.html comp-sys-htmlman html ./usr/share/man/html9/sendsig.html comp-sys-htmlman html ./usr/share/man/html9/setdisklabel.html comp-sys-htmlman html +./usr/share/man/html9/setbit.html comp-sys-htmlman html ./usr/share/man/html9/setjmp.html comp-sys-htmlman html ./usr/share/man/html9/shutdownhook_disestablish.html comp-sys-htmlman html ./usr/share/man/html9/shutdownhook_establish.html comp-sys-htmlman html @@ -20144,6 +20152,7 @@ ./usr/share/man/man9/clock_secs_to_ymdhms.9 comp-sys-man .man ./usr/share/man/man9/clock_ymdhms_to_secs.9 comp-sys-man .man ./usr/share/man/man9/closef.9 comp-sys-man .man +./usr/share/man/man9/clrbit.9 comp-sys-man .man ./usr/share/man/man9/cltom.9 comp-sys-man .man ./usr/share/man/man9/cn_check_magic.9 comp-sys-man .man ./usr/share/man/man9/cn_destroy_magic.9 comp-sys-man .man @@ -20479,6 +20488,8 @@ ./usr/share/man/man9/isapnp_config.9 comp-sys-man .man ./usr/share/man/man9/isapnp_devmatch.9 comp-sys-man .man ./usr/share/man/man9/isapnp_unconfig.9 comp-sys-man .man +./usr/share/man/man9/isclr.9 comp-sys-man .man +./usr/share/man/man9/isset.9 comp-sys-man .man ./usr/share/man/man9/issignal.9 comp-sys-man .man ./usr/share/man/man9/itimerfix.9 comp-sys-man .man ./usr/share/man/man9/kauth.9 comp-sys-man .man @@ -20833,6 +20844,7 @@ ./usr/share/man/man9/selwakeup.9 comp-obsolete obsolete ./usr/share/man/man9/sendsig.9 comp-sys-man .man ./usr/share/man/man9/setdisklabel.9 comp-sys-man .man +./usr/share/man/man9/setbit.9 comp-sys-man .man ./usr/share/man/man9/setjmp.9 comp-sys-man .man ./usr/share/man/man9/setrunqueue.9 comp-obsolete obsolete ./usr/share/man/man9/shutdownhook_disestablish.9 comp-sys-man
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: jruoho Date: Mon Mar 1 19:12:49 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add setbit(9). To generate a diff of this commit: cvs rdiff -u -r1.1399 -r1.1400 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src Committed By: matt Date: Mon Mar 1 19:26:01 UTC 2010 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: locore.h src/sys/arch/mips/mips [matt-nb5-mips64]: mips_fixup.c spl_stubs.c Log Message: Rework fixups support a bit (add a convience macro, require fixups to be sorted). To generate a diff of this commit: cvs rdiff -u -r1.78.36.1.2.18 -r1.78.36.1.2.19 \ src/sys/arch/mips/include/locore.h cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/mips/mips_fixup.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/mips/spl_stubs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src
Committed By: matt
Date: Mon Mar 1 19:26:01 UTC 2010
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: locore.h
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_fixup.c spl_stubs.c
Log Message:
Rework fixups support a bit (add a convience macro, require fixups to be
sorted).
To generate a diff of this commit:
cvs rdiff -u -r1.78.36.1.2.18 -r1.78.36.1.2.19 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/mips/mips_fixup.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/mips/spl_stubs.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/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78.36.1.2.18 src/sys/arch/mips/include/locore.h:1.78.36.1.2.19
--- src/sys/arch/mips/include/locore.h:1.78.36.1.2.18 Sun Feb 28 23:45:07 2010
+++ src/sys/arch/mips/include/locore.h Mon Mar 1 19:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.78.36.1.2.18 2010/02/28 23:45:07 matt Exp $ */
+/* $NetBSD: locore.h,v 1.78.36.1.2.19 2010/03/01 19:26:00 matt Exp $ */
/*
* This file should not be included by MI code!!!
@@ -45,13 +45,26 @@
void softint_process(uint32_t);
void softint_fast_dispatch(struct lwp *, int);
+/*
+ * Convert an address to an offset used in a MIPS jump instruction. The offset
+ * contains the low 28 bits (allowing a jump to anywhere within the same 256MB
+ * segment of address space) of the address but since mips instructions are
+ * always on a 4 byte boundary the low 2 bits are always zero so the 28 bits
+ * get shifted right by 2 bits leaving us with a 26 bit result. To make the
+ * offset, we shift left to clear the upper four bits and then right by 6.
+ */
+#define fixup_addr2offset(x) uint32_t)(uintptr_t)(x)) 4) 6)
typedef bool (*mips_fixup_callback_t)(int32_t, uint32_t [2]);
+struct mips_jump_fixup_info {
+ uint32_t jfi_stub;
+ uint32_t jfi_real;
+};
void fixup_splcalls(void);/* splstubs.c */
bool mips_fixup_exceptions(mips_fixup_callback_t);
bool mips_fixup_zero_relative(int32_t, uint32_t [2]);
-void mips_fixup_stubs(uint32_t *, uint32_t *, const uint32_t *,
- const uint32_t *, size_t);
+void mips_fixup_stubs(uint32_t *, uint32_t *,
+ const struct mips_jump_fixup_info *, size_t);
void fixup_mips_cpu_switch_resume(void);
void mips_cpu_switch_resume(struct lwp *);
Index: src/sys/arch/mips/mips/mips_fixup.c
diff -u src/sys/arch/mips/mips/mips_fixup.c:1.1.2.4 src/sys/arch/mips/mips/mips_fixup.c:1.1.2.5
--- src/sys/arch/mips/mips/mips_fixup.c:1.1.2.4 Sun Feb 28 15:32:32 2010
+++ src/sys/arch/mips/mips/mips_fixup.c Mon Mar 1 19:26:01 2010
@@ -29,7 +29,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mips_fixup.c,v 1.1.2.4 2010/02/28 15:32:32 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_fixup.c,v 1.1.2.5 2010/03/01 19:26:01 matt Exp $);
#include sys/param.h
@@ -175,44 +175,53 @@
#define OPCODE_J 002
#define OPCODE_JAL 003
-static void
-fixup_mips_jump(uint32_t *insnp, uint32_t stub, uint32_t real)
+static inline void
+fixup_mips_jump(uint32_t *insnp, const struct mips_jump_fixup_info *jfi)
{
uint32_t insn = *insnp;
KASSERT((insn (26+1)) == (OPCODE_J 1));
- KASSERT((insn 6) == (stub 4));
+ KASSERT((insn 6) == (jfi-jfi_stub 6));
- insn ^= (stub ^ real) 4 6;
+ insn ^= (jfi-jfi_stub ^ jfi-jfi_real);
- KASSERT((insn 6) == (real 4));
+ KASSERT((insn 6) == (jfi-jfi_real 6));
+#ifdef DEBUG
+#if 0
+ int32_t va = ((intptr_t) insnp 26) 26;
+ printf(%s: %08x: [%08x] %s %08x - [%08x] %s %08x\n,
+ __func__, (int32_t)(intptr_t)insnp,
+ insn, opcode == OPCODE_J ? j : jal,
+ va | (jfi-jfo_stub 2),
+ *insnp, opcode == OPCODE_J ? j : jal,
+ va | (jfi-jfi_real 2));
+#endif
+#endif
*insnp = insn;
}
void
mips_fixup_stubs(uint32_t *start, uint32_t *end,
- const uint32_t *stub_offsets, const uint32_t *real_offsets,
- size_t noffsets)
+ const struct mips_jump_fixup_info *fixups,
+ size_t nfixups)
{
- uint32_t min_offset = 0x03ff;
- uint32_t max_offset = 0x;
+ const uint32_t min_offset = fixups[0].jfi_stub;
+ const uint32_t max_offset = fixups[nfixups-1].jfi_stub;
#ifdef DEBUG
- size_t fixups = 0;
+ size_t fixups_done = 0;
uint32_t cycles = (CPUISMIPS3 ? mips3_cp0_count_read() : 0);
#endif
+#ifdef DIAGNOGSTIC
/*
- * Find the lowest and highest jumps we will be replacing. We don't
- * need to do it but it does make weeding out the non-matching jumps
- * faster.
+ * Verify the fixup list is sorted from low stub to high stub.
*/
- for (size_t i = 0; i noffsets; i++) {
- if (stub_offsets[i] min_offset)
- min_offset = stub_offsets[i];
- if (max_offset stub_offsets[i])
- max_offset = stub_offsets[i];
+ for (const struct mips_jump_fixup_info *jfi = fixups + 1;
+ jfi fixups + nfixups; jfi++) {
+ KASSERT(jfi[-1].jfi_stub jfi[0].jfi_stub);
}
+#endif
for
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Mon Mar 1 19:26:57 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_fpu.c
Log Message:
Put fp_lock and fp_cv in a common structure.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/mips/mips_fpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_fpu.c
diff -u src/sys/arch/mips/mips/mips_fpu.c:1.1.2.1 src/sys/arch/mips/mips/mips_fpu.c:1.1.2.2
--- src/sys/arch/mips/mips/mips_fpu.c:1.1.2.1 Sun Feb 28 23:45:06 2010
+++ src/sys/arch/mips/mips/mips_fpu.c Mon Mar 1 19:26:57 2010
@@ -29,7 +29,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mips_fpu.c,v 1.1.2.1 2010/02/28 23:45:06 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_fpu.c,v 1.1.2.2 2010/03/01 19:26:57 matt Exp $);
#include sys/param.h
#include sys/mutex.h
@@ -42,10 +42,14 @@
#include mips/regnum.h
#ifndef NOFPU
-kmutex_t fp_mutex __aligned(32);
+static struct {
+ kmutex_t fpx_mutex;
#ifdef MULTIPROCESSOR
-kcondvar_t fp_cv __aligned(32);
+ kcondvar_t fpx_cv;
#endif
+} fp_lockinfo __aligned(COHERENCY_UNIT);
+#define fp_mutex fp_lockinfo.fpx_mutex
+#define fp_cv fp_lockinfo.fpx_cv
#endif /* !NOFPU */
void
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src Committed By: matt Date: Mon Mar 1 19:29:42 UTC 2010 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h locore.h src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_subr.c genassym.cf locore_mips3.S mipsX_subr.S mips_machdep.c Log Message: Add secondary processor spinup support (cpu_trampoline is in locore_mips3.S). Nuke lse_boot_secondary_processors (not needed). Move cpu_info_store to cpu_subr.C To generate a diff of this commit: cvs rdiff -u -r1.90.16.24 -r1.90.16.25 src/sys/arch/mips/include/cpu.h cvs rdiff -u -r1.78.36.1.2.19 -r1.78.36.1.2.20 \ src/sys/arch/mips/include/locore.h cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/mips/cpu_subr.c cvs rdiff -u -r1.44.12.20 -r1.44.12.21 src/sys/arch/mips/mips/genassym.cf cvs rdiff -u -r1.93.38.7 -r1.93.38.8 src/sys/arch/mips/mips/locore_mips3.S cvs rdiff -u -r1.26.36.1.2.29 -r1.26.36.1.2.30 \ src/sys/arch/mips/mips/mipsX_subr.S cvs rdiff -u -r1.205.4.1.2.1.2.39 -r1.205.4.1.2.1.2.40 \ src/sys/arch/mips/mips/mips_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gmon
Module Name:src Committed By: christos Date: Mon Mar 1 19:52:38 UTC 2010 Modified Files: src/lib/libc/gmon: gmon.c Log Message: - KNF - fix hertz() - fix error and warning messages To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/gmon/gmon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gmon
Module Name:src
Committed By: christos
Date: Mon Mar 1 19:52:38 UTC 2010
Modified Files:
src/lib/libc/gmon: gmon.c
Log Message:
- KNF
- fix hertz()
- fix error and warning messages
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/gmon/gmon.c
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/gmon/gmon.c
diff -u src/lib/libc/gmon/gmon.c:1.31 src/lib/libc/gmon/gmon.c:1.32
--- src/lib/libc/gmon/gmon.c:1.31 Sun Jan 17 18:09:02 2010
+++ src/lib/libc/gmon/gmon.c Mon Mar 1 14:52:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gmon.c,v 1.31 2010/01/17 23:09:02 wiz Exp $ */
+/* $NetBSD: gmon.c,v 1.32 2010/03/01 19:52:38 christos Exp $ */
/*
* Copyright (c) 2003, 2004 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
#if 0
static char sccsid[] = @(#)gmon.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: gmon.c,v 1.31 2010/01/17 23:09:02 wiz Exp $);
+__RCSID($NetBSD: gmon.c,v 1.32 2010/03/01 19:52:38 christos Exp $);
#endif
#endif
@@ -104,24 +104,21 @@
/* see profil(2) where this is describe (incorrectly) */
#define SCALE_1_TO_1 0x1L
-#define ERR(s) write(STDERR_FILENO, s, sizeof(s))
-
-void moncontrol __P((int));
-void monstartup __P((u_long, u_long));
-void _mcleanup __P((void));
-static int hertz __P((void));
+void moncontrol(int);
+void monstartup(u_long, u_long);
+void _mcleanup(void);
+static int hertz(void);
#ifdef _REENTRANT
static void _m_gmon_destructor(void *);
-struct gmonparam *_m_gmon_alloc(void) __attribute__((__no_instrument_function__));
+struct gmonparam *_m_gmon_alloc(void)
+__attribute__((__no_instrument_function__));
static void _m_gmon_merge(void);
static void _m_gmon_merge_two(struct gmonparam *, struct gmonparam *);
#endif
void
-monstartup(lowpc, highpc)
- u_long lowpc;
- u_long highpc;
+monstartup(u_long lowpc, u_long highpc)
{
u_long o;
char *cp;
@@ -146,11 +143,11 @@
cp = sbrk((intptr_t)(p-kcountsize + p-fromssize + p-tossize));
if (cp == (char *)-1) {
- ERR(monstartup: out of memory\n);
+ warnx(%s: out of memory, __func__);
return;
}
#ifdef notdef
- memset(cp, 0, p-kcountsize + p-fromssize + p-tossize);
+ (void)memset(cp, 0, p-kcountsize + p-fromssize + p-tossize);
#endif
p-tos = (struct tostruct *)(void *)cp;
cp += (size_t)p-tossize;
@@ -350,10 +347,12 @@
mutex_lock(_gmonlock);
- for (q = _gmonfree; q != NULL; q = (struct gmonparam *)(void *)q-kcount)
+ for (q = _gmonfree; q != NULL;
+ q = (struct gmonparam *)(void *)q-kcount)
_m_gmon_merge_two(_gmonparam, q);
- for (q = _gmoninuse; q != NULL; q = (struct gmonparam *)(void *)q-kcount) {
+ for (q = _gmoninuse; q != NULL;
+ q = (struct gmonparam *)(void *)q-kcount) {
q-state = GMON_PROF_OFF;
_m_gmon_merge_two(_gmonparam, q);
}
@@ -363,7 +362,7 @@
#endif
void
-_mcleanup()
+_mcleanup(void)
{
int fd;
int fromindex;
@@ -390,13 +389,13 @@
* our real one.
*/
if (issetugid() (geteuid() != getuid() || getegid() != getgid())) {
- warnx(mcount: Profiling of set{u,g}id binaries is not
- allowed);
+ warnx(%s: Profiling of set{u,g}id binaries is not
+ allowed, __func__);
return;
}
if (p-state == GMON_PROF_ERROR)
- ERR(_mcleanup: tos overflow\n);
+ warnx(%s: tos overflow, __func__);
size = sizeof(clockinfo);
mib[0] = CTL_KERN;
@@ -422,8 +421,9 @@
return;
if (snprintf(buf, sizeof buf, %s/%d.%s,
- profdir, getpid(), getprogname()) = (int)(sizeof buf)) {
- warnx(_mcleanup: internal buffer overflow, PROFDIR too long);
+ profdir, getpid(), getprogname()) = (int)(sizeof buf)) {
+ warnx(%s: internal buffer overflow, PROFDIR too long,
+ __func__);
return;
}
@@ -434,13 +434,13 @@
fd = open(proffile , O_CREAT|O_TRUNC|O_WRONLY, 0666);
if (fd 0) {
- warn(mcount: Cannot open `%s', proffile);
+ warn(%s: Cannot open `%s', __func__, proffile);
return;
}
#ifdef DEBUG
logfd = open(gmon.log, O_CREAT|O_TRUNC|O_WRONLY, 0664);
if (logfd 0) {
- warn(mcount: Cannot open `gmon.log');
+ warn(%s: Cannot open `%s', __func__, gmon.log);
return;
}
len = snprintf(buf2, sizeof buf2, [mcleanup1] kcount %p ssiz %lu\n,
@@ -477,12 +477,12 @@
rawarc.raw_frompc = frompc;
rawarc.raw_selfpc = p-tos[toindex].selfpc;
rawarc.raw_count = p-tos[toindex].count;
- write(fd, rawarc, sizeof rawarc);
+ (void)write(fd, rawarc, sizeof rawarc);
}
}
- close(fd);
+ (void)close(fd);
#ifdef DEBUG
- close(logfd);
+ (void)close(logfd);
#endif
}
@@ -492,8 +492,7 @@
* all the data structures are ready.
*/
void
-moncontrol(mode)
- int mode;
+moncontrol(int mode)
{
struct gmonparam *p = _gmonparam;
@@ -514,17 +513,31 @@
* if something goes wrong, we return 0, an impossible hertz.
*/
static int
-hertz()
+hertz(void)
{
- struct itimerval tim;
-
- tim.it_interval.tv_sec = 0;
- tim.it_interval.tv_usec = 1;
- tim.it_value.tv_sec = 0;
-
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: haad Date: Mon Mar 1 20:06:37 UTC 2010 Added Files: src/external/cddl/osnet/sys/sys: priv_names.h Log Message: This id compile time generated file add it to sys/sys and do not polute dist dir with it. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/sys/priv_names.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: haad
Date: Mon Mar 1 20:06:37 UTC 2010
Added Files:
src/external/cddl/osnet/sys/sys: priv_names.h
Log Message:
This id compile time generated file add it to sys/sys and do not polute
dist dir with it.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/sys/priv_names.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/cddl/osnet/sys/sys/priv_names.h
diff -u /dev/null src/external/cddl/osnet/sys/sys/priv_names.h:1.1
--- /dev/null Mon Mar 1 20:06:37 2010
+++ src/external/cddl/osnet/sys/sys/priv_names.h Mon Mar 1 20:06:37 2010
@@ -0,0 +1,681 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the License).
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets [] replaced with your own identifying
+ * information: Portions Copyright [] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Privilege constant definitions. Privileges and privilege sets
+ * are only known by name and should be mapped at runtime.
+ *
+ * THIS FILE WAS GENERATED; DO NOT EDIT
+ */
+
+
+#ifndef _SYS_PRIV_NAMES_H
+#define _SYS_PRIV_NAMES_H
+
+
+
+#ifdef __cplusplus
+extern C {
+#endif
+
+#ifndef __PRIV_CONST_IMPL
+/*
+ * Privilege names
+ */
+/*
+ * Allows a process to request critical events without limitation.
+ * Allows a process to request reliable delivery of all events on
+ * any event queue.
+ */
+#define PRIV_CONTRACT_EVENT ((const char *)contract_event)
+
+/*
+ * Allows a process to set the service FMRI value of a process
+ * contract template.
+ */
+#define PRIV_CONTRACT_IDENTITY ((const char *)contract_identity)
+
+/*
+ * Allows a process to observe contract events generated by
+ * contracts created and owned by users other than the process's
+ * effective user ID.
+ * Allows a process to open contract event endpoints belonging to
+ * contracts created and owned by users other than the process's
+ * effective user ID.
+ */
+#define PRIV_CONTRACT_OBSERVER ((const char *)contract_observer)
+
+/*
+ * Allow a process to access per-CPU hardware performance counters.
+ */
+#define PRIV_CPC_CPU ((const char *)cpc_cpu)
+
+/*
+ * Allows DTrace kernel-level tracing.
+ */
+#define PRIV_DTRACE_KERNEL ((const char *)dtrace_kernel)
+
+/*
+ * Allows DTrace process-level tracing.
+ * Allows process-level tracing probes to be placed and enabled in
+ * processes to which the user has permissions.
+ */
+#define PRIV_DTRACE_PROC ((const char *)dtrace_proc)
+
+/*
+ * Allows DTrace user-level tracing.
+ * Allows use of the syscall and profile DTrace providers to
+ * examine processes to which the user has permissions.
+ */
+#define PRIV_DTRACE_USER ((const char *)dtrace_user)
+
+/*
+ * Allows a process to change a file's owner user ID.
+ * Allows a process to change a file's group ID to one other than
+ * the process' effective group ID or one of the process'
+ * supplemental group IDs.
+ */
+#define PRIV_FILE_CHOWN ((const char *)file_chown)
+
+/*
+ * Allows a process to give away its files; a process with this
+ * privilege will run as if {_POSIX_CHOWN_RESTRICTED} is not
+ * in effect.
+ */
+#define PRIV_FILE_CHOWN_SELF ((const char *)file_chown_self)
+
+/*
+ * Allows a process to execute an executable file whose permission
+ * bits or ACL do not allow the process execute permission.
+ */
+#define PRIV_FILE_DAC_EXECUTE ((const char *)file_dac_execute)
+
+/*
+ * Allows a process to read a file or directory whose permission
+ * bits or ACL do not allow the process read permission.
+ */
+#define PRIV_FILE_DAC_READ ((const char *)file_dac_read)
+
+/*
+ * Allows a process to search a directory whose permission bits or
+ * ACL do not allow the process search permission.
+ */
+#define PRIV_FILE_DAC_SEARCH ((const char *)file_dac_search)
+
+/*
+ * Allows a process to write a file or directory whose permission
+ * bits or ACL do not allow the process write permission.
+ * In order to write files owned by uid 0 in the absence of an
+ * effective uid of 0 ALL privileges are required.
+ */
+#define PRIV_FILE_DAC_WRITE ((const char *)file_dac_write)
+
+/*
+ * Allows a process to set the sensitivity label of a file or
+ * directory to a sensitivity label that does not dominate
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src Committed By: haad Date: Mon Mar 1 20:10:46 UTC 2010 Removed Files: src/external/cddl/osnet/dist/uts/common/sys: priv_names.h Log Message: Removee compile time generated file from dist it is in osnet/sys/sys now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 \ src/external/cddl/osnet/dist/uts/common/sys/priv_names.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src Committed By: haad Date: Mon Mar 1 20:10:46 UTC 2010 Removed Files: src/external/cddl/osnet/dist/uts/common/sys: priv_names.h Log Message: Removee compile time generated file from dist it is in osnet/sys/sys now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 \ src/external/cddl/osnet/dist/uts/common/sys/priv_names.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: haad Date: Mon Mar 1 20:38:19 UTC 2010 Removed Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: fletcher.c Log Message: Remove fletcher.c from dist it was moved to common/zfs/zfs_fletcher.c in upstream. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/fletcher.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/share/man/man3
Module Name: src Committed By:jruoho Date:Mon Mar 1 13:44:10 UTC 2010 Modified Files: src/share/man/man3: Makefile Added Files: src/share/man/man3: __UNCONST.3 Log Message: Document __UNCONST and __UNVOLATILE. XXX: If there is anything to add or correct, please do so! could you use some stronger wording about avoiding using these unless absolutely necessary, and please note that they can also be used for variable assignment, not just for function calls. thanks. .mrg.
CVS commit: src
Module Name:src Committed By: darran Date: Mon Mar 1 21:10:19 UTC 2010 Modified Files: src/distrib/sets/lists/modules: mi src/external/cddl/osnet/dev/sdt: sdt.c src/sys/conf: Makefile.kern.inc files src/sys/kern: kern_exec.c kern_exit.c kern_fork.c kern_ksyms.c kern_lwp.c kern_sig.c src/sys/modules/dtrace: Makefile src/sys/sys: Makefile ksyms.h Added Files: src/sys/kern: kern_sdt.c src/sys/modules/dtrace/sdt: Makefile src/sys/sys: sdt.h Log Message: DTrace: Add an SDT (Statically Defined Tracing) provider framework, and implement most of the proc provider. Adds proc:::create, exec, exec_success, exec_faillure, signal_send, signal_discard, signal_handle, lwp_create, lwp_start, lwp_exit. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dev/sdt/sdt.c cvs rdiff -u -r1.125 -r1.126 src/sys/conf/Makefile.kern.inc cvs rdiff -u -r1.977 -r1.978 src/sys/conf/files cvs rdiff -u -r1.293 -r1.294 src/sys/kern/kern_exec.c cvs rdiff -u -r1.225 -r1.226 src/sys/kern/kern_exit.c cvs rdiff -u -r1.175 -r1.176 src/sys/kern/kern_fork.c cvs rdiff -u -r1.53 -r1.54 src/sys/kern/kern_ksyms.c cvs rdiff -u -r1.140 -r1.141 src/sys/kern/kern_lwp.c cvs rdiff -u -r0 -r1.1 src/sys/kern/kern_sdt.c cvs rdiff -u -r1.302 -r1.303 src/sys/kern/kern_sig.c cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dtrace/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/sdt/Makefile cvs rdiff -u -r1.125 -r1.126 src/sys/sys/Makefile cvs rdiff -u -r1.23 -r1.24 src/sys/sys/ksyms.h cvs rdiff -u -r0 -r1.1 src/sys/sys/sdt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.7 src/distrib/sets/lists/modules/mi:1.8 --- src/distrib/sets/lists/modules/mi:1.7 Sun Feb 21 03:18:47 2010 +++ src/distrib/sets/lists/modules/mi Mon Mar 1 21:10:19 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.7 2010/02/21 03:18:47 darran Exp $ +# $NetBSD: mi,v 1.8 2010/03/01 21:10:19 darran Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -92,6 +92,8 @@ ./@MODULEDIR@/puffs/puffs.kmod base-kernel-modules kmod ./@MODULEDIR@/putterbase-kernel-modules kmod ./@MODULEDIR@/putter/putter.kmod base-kernel-modules kmod +./@MODULEDIR@/sdtbase-kernel-modules kmod,dtrace +./@MODULEDIR@/sdt/sdt.kmod base-kernel-modules kmod,dtrace ./@MODULEDIR@/secmodel_bsd44 base-kernel-modules kmod ./@MODULEDIR@/secmodel_bsd44/secmodel_bsd44.kmod base-kernel-modules kmod ./@MODULEDIR@/secmodel_overlay base-kernel-modules kmod @@ -100,8 +102,8 @@ ./@MODULEDIR@/securelevel/securelevel.kmod base-kernel-modules kmod ./@MODULEDIR@/smbfsbase-kernel-modules kmod ./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules kmod -./@MODULEDIR@/solarisbase-kernel-modules kmod,zfs -./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,zfs +./@MODULEDIR@/solarisbase-kernel-modules kmod,dtrace +./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,dtrace ./@MODULEDIR@/suserbase-kernel-modules kmod ./@MODULEDIR@/suser/suser.kmod base-kernel-modules kmod ./@MODULEDIR@/sysvbfsbase-kernel-modules kmod Index: src/external/cddl/osnet/dev/sdt/sdt.c diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.2 src/external/cddl/osnet/dev/sdt/sdt.c:1.3 --- src/external/cddl/osnet/dev/sdt/sdt.c:1.2 Sun Feb 21 01:46:33 2010 +++ src/external/cddl/osnet/dev/sdt/sdt.c Mon Mar 1 21:10:19 2010 @@ -1,33 +1,38 @@ -/* $NetBSD: sdt.c,v 1.2 2010/02/21 01:46:33 darran Exp $ */ +/* $NetBSD: sdt.c,v 1.3 2010/03/01 21:10:19 darran Exp $ */ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the License). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. +/*- + * Copyright (c) 2010 The NetBSD Foundation, Inc. + * All rights reserved. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets [] replaced with your own identifying - * information: Portions Copyright [] [name of copyright owner] + * This code is derived from software contributed to The NetBSD Foundation + * by CoyotePoint Systems, Inc. It was developed under contract to + * CoyotePoint by Darran Hunt. * - * CDDL HEADER END + * Redistribution and use in source and binary forms, with or without + * modification, are
CVS commit: src
Module Name:src Committed By: darran Date: Mon Mar 1 21:10:19 UTC 2010 Modified Files: src/distrib/sets/lists/modules: mi src/external/cddl/osnet/dev/sdt: sdt.c src/sys/conf: Makefile.kern.inc files src/sys/kern: kern_exec.c kern_exit.c kern_fork.c kern_ksyms.c kern_lwp.c kern_sig.c src/sys/modules/dtrace: Makefile src/sys/sys: Makefile ksyms.h Added Files: src/sys/kern: kern_sdt.c src/sys/modules/dtrace/sdt: Makefile src/sys/sys: sdt.h Log Message: DTrace: Add an SDT (Statically Defined Tracing) provider framework, and implement most of the proc provider. Adds proc:::create, exec, exec_success, exec_faillure, signal_send, signal_discard, signal_handle, lwp_create, lwp_start, lwp_exit. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dev/sdt/sdt.c cvs rdiff -u -r1.125 -r1.126 src/sys/conf/Makefile.kern.inc cvs rdiff -u -r1.977 -r1.978 src/sys/conf/files cvs rdiff -u -r1.293 -r1.294 src/sys/kern/kern_exec.c cvs rdiff -u -r1.225 -r1.226 src/sys/kern/kern_exit.c cvs rdiff -u -r1.175 -r1.176 src/sys/kern/kern_fork.c cvs rdiff -u -r1.53 -r1.54 src/sys/kern/kern_ksyms.c cvs rdiff -u -r1.140 -r1.141 src/sys/kern/kern_lwp.c cvs rdiff -u -r0 -r1.1 src/sys/kern/kern_sdt.c cvs rdiff -u -r1.302 -r1.303 src/sys/kern/kern_sig.c cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dtrace/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/sdt/Makefile cvs rdiff -u -r1.125 -r1.126 src/sys/sys/Makefile cvs rdiff -u -r1.23 -r1.24 src/sys/sys/ksyms.h cvs rdiff -u -r0 -r1.1 src/sys/sys/sdt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: jld
Date: Mon Mar 1 21:10:27 UTC 2010
Modified Files:
src/sys/dev/raidframe: rf_disks.c
Log Message:
When setting up a non-autoconfigured RAID set, fail a component if the
attempt to read its label fails. OKed by os...@.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/raidframe/rf_disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_disks.c
diff -u src/sys/dev/raidframe/rf_disks.c:1.72 src/sys/dev/raidframe/rf_disks.c:1.73
--- src/sys/dev/raidframe/rf_disks.c:1.72 Tue Nov 17 18:54:26 2009
+++ src/sys/dev/raidframe/rf_disks.c Mon Mar 1 21:10:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.72 2009/11/17 18:54:26 jld Exp $ */
+/* $NetBSD: rf_disks.c,v 1.73 2010/03/01 21:10:26 jld Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -60,7 +60,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_disks.c,v 1.72 2009/11/17 18:54:26 jld Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_disks.c,v 1.73 2010/03/01 21:10:26 jld Exp $);
#include dev/raidframe/raidframevar.h
@@ -132,7 +132,9 @@
goto fail;
if (disks[c].status == rf_ds_optimal) {
- raidfetch_component_label(raidPtr, c);
+ ret = raidfetch_component_label(raidPtr, c);
+ if (ret)
+goto fail;
}
if (disks[c].status != rf_ds_optimal) {
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: jld Date: Mon Mar 1 21:10:27 UTC 2010 Modified Files: src/sys/dev/raidframe: rf_disks.c Log Message: When setting up a non-autoconfigured RAID set, fail a component if the attempt to read its label fails. OKed by os...@. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/dev/raidframe/rf_disks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet
Module Name:src Committed By: haad Date: Mon Mar 1 21:13:10 UTC 2010 Modified Files: src/external/cddl/osnet/lib/libzpool: kernel.c Added Files: src/external/cddl/osnet/include: statcommon.h Log Message: Commit last to fixes which make zfs version 22 compiling again. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/include/statcommon.h cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/lib/libzpool/kernel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Mon Mar 1 21:34:30 UTC 2010 Modified Files: src/share/man/man3: __arraycount.3 Log Message: Uppercase Dt, make HTML-ready. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man3/__arraycount.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Mon Mar 1 21:34:30 UTC 2010 Modified Files: src/share/man/man3: __arraycount.3 Log Message: Uppercase Dt, make HTML-ready. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man3/__arraycount.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/__arraycount.3 diff -u src/share/man/man3/__arraycount.3:1.2 src/share/man/man3/__arraycount.3:1.3 --- src/share/man/man3/__arraycount.3:1.2 Mon Mar 1 17:06:18 2010 +++ src/share/man/man3/__arraycount.3 Mon Mar 1 21:34:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: __arraycount.3,v 1.2 2010/03/01 17:06:18 jruoho Exp $ +.\ $NetBSD: __arraycount.3,v 1.3 2010/03/01 21:34:30 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -29,7 +29,7 @@ .\ .Dd March 1, 2010 .Os -.Dt __arraycount 3 +.Dt __ARRAYCOUNT 3 .Sh NAME .Nm __arraycount .Nd macro for statically allocated arrays @@ -50,7 +50,7 @@ \... -for (i = 0; i __arraycount(buf); i++) +for (i = 0; i \*[Lt] __arraycount(buf); i++) \... .Ed .Sh HISTORY
Re: CVS commit: src/crypto/external/bsd/netpgp/dist/src/hkpd
Why do we want to have another ad-hoc HTTP implementation? Wouldn't a small *CGI script be good enough? Joerg On Mon, Mar 01, 2010 at 07:41:57AM +, Alistair G. Crooks wrote: Module Name: src Committed By: agc Date: Mon Mar 1 07:41:57 UTC 2010 Added Files: src/crypto/external/bsd/netpgp/dist/src/hkpd: Makefile hkpd.c hkpd.h main.c Log Message: add an embryonic httpd key server (hkpd) to netpgp. this is based on the discontinued draft for hkp servers, in lieu of any official rfc. the post method for adding keys to the server has not been implemented. not until i've gone through all of the implications, anyway. hkp servers serve up pgp public keys over http. the default port is 11371, but it can be any port, specifiable at run time. whilst this hkpd will return valid html to browsers, it is aimed at the ''machine readable'' side, using the ''options=mr'' option to the http get string. this hkpd server will get hooked into the build at a later date. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/dist/src/hkpd/Makefile \ src/crypto/external/bsd/netpgp/dist/src/hkpd/hkpd.c \ src/crypto/external/bsd/netpgp/dist/src/hkpd/hkpd.h \ src/crypto/external/bsd/netpgp/dist/src/hkpd/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Mon Mar 1 21:37:18 UTC 2010 Modified Files: src/share/man/man3: tgmath.3 Log Message: Serial comma. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/tgmath.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Mon Mar 1 21:37:18 UTC 2010 Modified Files: src/share/man/man3: tgmath.3 Log Message: Serial comma. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man3/tgmath.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/tgmath.3 diff -u src/share/man/man3/tgmath.3:1.1 src/share/man/man3/tgmath.3:1.2 --- src/share/man/man3/tgmath.3:1.1 Mon Mar 1 16:36:15 2010 +++ src/share/man/man3/tgmath.3 Mon Mar 1 21:37:18 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tgmath.3,v 1.1 2010/03/01 16:36:15 jruoho Exp $ +.\ $NetBSD: tgmath.3,v 1.2 2010/03/01 21:37:18 wiz Exp $ .\ .\ Copyright (c) 2004 Stefan Farfeleder .\ All rights reserved. @@ -46,14 +46,14 @@ .Vt float (suffixed with .Sy f ) , -.Vt double +.Vt double , and .Vt long double (suffixed with .Sy l ) versions. The arguments that vary across the three functions and have type -.Vt float , double +.Vt float , double , and .Vt long double , respectively, are called @@ -69,7 +69,7 @@ .Vt long double function is called. Else, if any generic argument has type -.Vt double , double complex +.Vt double , double complex , or an integer type, the .Vt double version is invoked.
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/evp
Module Name:src
Committed By: joerg
Date: Mon Mar 1 21:47:43 UTC 2010
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/evp: m_sha1.c
Log Message:
Ensure that SHA384 always calls the SHA384 functions.
Should fix PR 42881.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.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/openssl/dist/crypto/evp/m_sha1.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.2 Sun Jul 19 23:30:39 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c Mon Mar 1 21:47:43 2010
@@ -158,8 +158,12 @@
static int init512(EVP_MD_CTX *ctx)
{ return SHA512_Init(ctx-md_data); }
/* See comment in SHA224/256 section */
+static int update384(EVP_MD_CTX *ctx,const void *data,size_t count)
+ { return SHA384_Update(ctx-md_data,data,count); }
static int update512(EVP_MD_CTX *ctx,const void *data,size_t count)
{ return SHA512_Update(ctx-md_data,data,count); }
+static int final384(EVP_MD_CTX *ctx,unsigned char *md)
+ { return SHA384_Final(md,ctx-md_data); }
static int final512(EVP_MD_CTX *ctx,unsigned char *md)
{ return SHA512_Final(md,ctx-md_data); }
@@ -170,8 +174,8 @@
SHA384_DIGEST_LENGTH,
EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
init384,
- update512,
- final512,
+ update384,
+ final384,
NULL,
NULL,
EVP_PKEY_RSA_method,
CVS commit: src/bin/sh
Module Name:src Committed By: joerg Date: Mon Mar 1 21:53:59 UTC 2010 Modified Files: src/bin/sh: sh.1 Log Message: \\ - \e To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: joerg Date: Mon Mar 1 21:53:59 UTC 2010 Modified Files: src/bin/sh: sh.1 Log Message: \\ - \e To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.97 src/bin/sh/sh.1:1.98 --- src/bin/sh/sh.1:1.97 Fri Jan 1 21:46:31 2010 +++ src/bin/sh/sh.1 Mon Mar 1 21:53:58 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sh.1,v 1.97 2010/01/01 21:46:31 wiz Exp $ +.\ $NetBSD: sh.1,v 1.98 2010/03/01 21:53:58 joerg Exp $ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. .\ @@ -1471,7 +1471,7 @@ case $f in a | b) flag=$f;; c) carg=$OPTARG;; - \\?) echo $USAGE; exit 1;; + \e?) echo $USAGE; exit 1;; esac done shift `expr $OPTIND - 1`
CVS commit: src/share/mk
Module Name:src Committed By: joerg Date: Mon Mar 1 22:00:07 UTC 2010 Modified Files: src/share/mk: bsd.man.mk Log Message: Make lintmanpages not depend on MKMANDOC, it is built by default now. Use -Wall to increase usefulness. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/share/mk/bsd.man.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Mon Mar 1 22:00:07 UTC 2010
Modified Files:
src/share/mk: bsd.man.mk
Log Message:
Make lintmanpages not depend on MKMANDOC, it is built by default now.
Use -Wall to increase usefulness.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/share/mk/bsd.man.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.man.mk
diff -u src/share/mk/bsd.man.mk:1.102 src/share/mk/bsd.man.mk:1.103
--- src/share/mk/bsd.man.mk:1.102 Fri Oct 23 23:12:10 2009
+++ src/share/mk/bsd.man.mk Mon Mar 1 22:00:07 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.102 2009/10/23 23:12:10 joerg Exp $
+# $NetBSD: bsd.man.mk,v 1.103 2010/03/01 22:00:07 joerg Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include bsd.init.mk
@@ -6,9 +6,7 @@
# Basic targets
.PHONY: catinstall maninstall catpages manpages catlinks manlinks
.PHONY: htmlinstall htmlpages htmllinks
-.if ${MKMANDOC} == yes
.PHONY: lintmanpages
-.endif
realinstall: ${MANINSTALL}
# Default values
@@ -274,9 +272,9 @@
.endif
# (XXX ${CATPAGES:S...} cleans up old .catN files where .catN.gz now used)
-.if ${MKMANDOC} == yes !empty(MANPAGES)
+.if !empty(MANPAGES)
lintmanpages: ${MANPAGES}
- ${TOOL_MANDOC_LINT} -Tlint -fstrict ${.ALLSRC}
+ ${TOOL_MANDOC_LINT} -Tlint -fstrict -Wall ${.ALLSRC}
.endif
# Pull in related .mk logic
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src Committed By: darran Date: Mon Mar 1 22:20:15 UTC 2010 Modified Files: src/external/cddl/osnet/dist/uts/common/sys: processor.h Log Message: DTrace: processorid_t is defined elsewhere (pset.h), so make it a sun only definition here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/sys/processor.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/sys/processor.h diff -u src/external/cddl/osnet/dist/uts/common/sys/processor.h:1.3 src/external/cddl/osnet/dist/uts/common/sys/processor.h:1.4 --- src/external/cddl/osnet/dist/uts/common/sys/processor.h:1.3 Sat Feb 27 23:43:53 2010 +++ src/external/cddl/osnet/dist/uts/common/sys/processor.h Mon Mar 1 22:20:15 2010 @@ -54,7 +54,9 @@ /* * Type for processor name (CPU number). */ +#if defined(sun) typedef int processorid_t; +#endif typedef int chipid_t; /*
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src Committed By: darran Date: Mon Mar 1 22:20:15 UTC 2010 Modified Files: src/external/cddl/osnet/dist/uts/common/sys: processor.h Log Message: DTrace: processorid_t is defined elsewhere (pset.h), so make it a sun only definition here. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/cddl/osnet/dist/uts/common/sys/processor.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: darran
Date: Mon Mar 1 22:27:07 UTC 2010
Modified Files:
src/sys/kern: kern_ksyms.c
Log Message:
Revert accidental commit of CTF work-in-progress changes.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/kern/kern_ksyms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.54 src/sys/kern/kern_ksyms.c:1.55
--- src/sys/kern/kern_ksyms.c:1.54 Mon Mar 1 21:10:16 2010
+++ src/sys/kern/kern_ksyms.c Mon Mar 1 22:27:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.54 2010/03/01 21:10:16 darran Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.55 2010/03/01 22:27:07 darran Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.54 2010/03/01 21:10:16 darran Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.55 2010/03/01 22:27:07 darran Exp $);
#if defined(_KERNEL) defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -124,7 +124,6 @@
int ksyms_symsz;
int ksyms_strsz;
-int ksyms_ctfsz = 0;
TAILQ_HEAD(, ksyms_symtab) ksyms_symtabs =
TAILQ_HEAD_INITIALIZER(ksyms_symtabs);
static struct ksyms_symtab kernel_symtab;
@@ -265,7 +264,7 @@
static void
addsymtab(const char *name, void *symstart, size_t symsize,
void *strstart, size_t strsize, struct ksyms_symtab *tab,
- void *newstart, void *ctfstart, size_t ctfsize)
+ void *newstart)
{
Elf_Sym *sym, *nsym, ts;
int i, j, n, nglob;
@@ -280,8 +279,6 @@
tab-sd_maxsym = 0;
tab-sd_usroffset = 0;
tab-sd_gone = false;
- tab-sd_ctfstart = ctfstart;
- tab-sd_ctfsize = ctfsize;
#ifdef KSYMS_DEBUG
printf(newstart %p sym %p ksyms_symsz %d str %p strsz %d send %p\n,
newstart, symstart, symsize, strstart, strsize,
@@ -356,8 +353,6 @@
char *symstart = NULL, *strstart = NULL;
size_t strsize = 0;
Elf_Ehdr *ehdr;
- char *ctfstart = NULL;
- size_t ctfsize = 0;
if (symsize = 0) {
printf([ Kernel symbol table missing! ]\n);
@@ -402,26 +397,10 @@
break;
}
- /* Find the CTF section */
- shdr = (Elf_Shdr *)((uint8_t *)start + ehdr-e_shoff);
- for (i = 1; i ehdr-e_shnum; i++) {
- if (shdr[i].sh_type != SHT_PROGBITS)
- continue;
- if (strncmp(.SUNW_ctf, strstart[shdr[i].sh_name] ,10) != 0)
- continue;
- ctfstart = (uint8_t *)start + shdr[i].sh_offset;
- ctfsize = shdr[i].sh_size;
- ksyms_ctfsz = ctfsize;
- printf(%s: found CTF at 0x%x, size 0x%x\n,
- __func__,
- (uint32_t)ctfstart, ctfsize);
- break;
- }
-
if (!ksyms_verify(symstart, strstart))
return;
addsymtab(netbsd, symstart, symsize, strstart, strsize,
- kernel_symtab, start, ctfstart, ctfsize);
+ kernel_symtab, start);
#ifdef DEBUG
aprint_normal(Loaded initial symtab at %p, strtab at %p, # entries %ld\n,
@@ -448,7 +427,7 @@
ksyms_hdr_init(ehdr);
addsymtab(netbsd, symstart, symsize, strstart, strsize,
- kernel_symtab, symstart, NULL, 0);
+ kernel_symtab, symstart);
}
/*
@@ -569,8 +548,7 @@
st = kmem_zalloc(sizeof(*st), KM_SLEEP);
mutex_enter(ksyms_lock);
- addsymtab(name, symstart, symsize, strstart, strsize, st, symstart,
- NULL, 0);
+ addsymtab(name, symstart, symsize, strstart, strsize, st, symstart);
mutex_exit(ksyms_lock);
}
@@ -738,20 +716,12 @@
/* Fifth section, .bss. All symbols reside here. */
ksyms_hdr.kh_shdr[SHBSS].sh_name = 27; /* This section name offset */
- ksyms_hdr.kh_shdr[SHBSS].sh_type = SHT_SYMTAB;
+ ksyms_hdr.kh_shdr[SHBSS].sh_type = SHT_NOBITS;
ksyms_hdr.kh_shdr[SHBSS].sh_offset = 0;
ksyms_hdr.kh_shdr[SHBSS].sh_size = (unsigned long)-1L;
ksyms_hdr.kh_shdr[SHBSS].sh_addralign = PAGE_SIZE;
ksyms_hdr.kh_shdr[SHBSS].sh_flags = SHF_ALLOC | SHF_EXECINSTR;
- /* Sixth section, .SUNW_ctf. CTF section for DTrace */
- ksyms_hdr.kh_shdr[SHCTF].sh_name = 32; /* This section name offset */
- ksyms_hdr.kh_shdr[SHCTF].sh_type = SHT_NOBITS;
-/* ksyms_hdr.kh_shdr[SHCTF].sh_offset = filled at open; */
-/* ksyms_hdr.kh_shdr[SHCTF].sh_size = filled at open; */
- ksyms_hdr.kh_shdr[SHCTF].sh_addralign = PAGE_SIZE;
- ksyms_hdr.kh_shdr[SHCTF].sh_flags = 0;
-
/* Set section names */
strlcpy(ksyms_hdr.kh_strtab[1], .symtab,
sizeof(ksyms_hdr.kh_strtab) - 1);
@@ -761,8 +731,6 @@
sizeof(ksyms_hdr.kh_strtab) - 17);
strlcpy(ksyms_hdr.kh_strtab[27], .bss,
sizeof(ksyms_hdr.kh_strtab) - 27);
- strlcpy(ksyms_hdr.kh_strtab[32], .SUNW_ctf,
- sizeof(ksyms_hdr.kh_strtab) - 32);
}
static int
@@ -779,11 +747,8 @@
mutex_enter(ksyms_lock);
ksyms_hdr.kh_shdr[SYMTAB].sh_size = ksyms_symsz;
ksyms_hdr.kh_shdr[SYMTAB].sh_info = ksyms_symsz / sizeof(Elf_Sym);
- ksyms_hdr.kh_shdr[SHCTF].sh_size = ksyms_ctfsz;
- ksyms_hdr.kh_shdr[SHCTF].sh_offset = ksyms_symsz +
+ ksyms_hdr.kh_shdr[STRTAB].sh_offset = ksyms_symsz +
ksyms_hdr.kh_shdr[SYMTAB].sh_offset;
-
CVS commit: src/sys/kern
Module Name:src Committed By: darran Date: Mon Mar 1 22:27:07 UTC 2010 Modified Files: src/sys/kern: kern_ksyms.c Log Message: Revert accidental commit of CTF work-in-progress changes. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/kern/kern_ksyms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dev/sdt
Module Name:src
Committed By: darran
Date: Mon Mar 1 22:38:30 UTC 2010
Modified Files:
src/external/cddl/osnet/dev/sdt: sdt.c
Log Message:
DTrace: update sdt.c handlers to match latest OpenSolaris vendor import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/sdt/sdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.3 src/external/cddl/osnet/dev/sdt/sdt.c:1.4
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.3 Mon Mar 1 21:10:19 2010
+++ src/external/cddl/osnet/dev/sdt/sdt.c Mon Mar 1 22:38:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdt.c,v 1.3 2010/03/01 21:10:19 darran Exp $ */
+/* $NetBSD: sdt.c,v 1.4 2010/03/01 22:38:29 darran Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -54,9 +54,9 @@
static int sdt_unload(void);
static void sdt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *);
-static void sdt_provide(void *, dtrace_probedesc_t *);
+static void sdt_provide(void *, const dtrace_probedesc_t *);
static void sdt_destroy(void *, dtrace_id_t, void *);
-static void sdt_enable(void *, dtrace_id_t, void *);
+static int sdt_enable(void *, dtrace_id_t, void *);
static void sdt_disable(void *, dtrace_id_t, void *);
static void sdt_load(void *);
@@ -195,7 +195,7 @@
}
static void
-sdt_provide(void *arg, dtrace_probedesc_t *desc)
+sdt_provide(void *arg, const dtrace_probedesc_t *desc)
{
sdt_provider_t *sprov = arg;
int res;
@@ -266,7 +266,7 @@
}
}
-static void
+static int
sdt_enable(void *arg, dtrace_id_t id, void *parg)
{
sdt_provider_t *sprov = arg;
@@ -290,6 +290,8 @@
break;
}
}
+
+ return 0;
}
static void
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: martin Date: Mon Mar 1 22:53:09 UTC 2010 Modified Files: src/sys/arch/sparc64/dev: tda.c Log Message: Fix printf formats (for 32bit compiles) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/tda.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/sparc64/dev
Module Name:src Committed By: martin Date: Mon Mar 1 22:53:09 UTC 2010 Modified Files: src/sys/arch/sparc64/dev: tda.c Log Message: Fix printf formats (for 32bit compiles) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/tda.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/sparc64/dev/tda.c diff -u src/sys/arch/sparc64/dev/tda.c:1.1 src/sys/arch/sparc64/dev/tda.c:1.2 --- src/sys/arch/sparc64/dev/tda.c:1.1 Sun Feb 28 11:49:44 2010 +++ src/sys/arch/sparc64/dev/tda.c Mon Mar 1 22:53:09 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: tda.c,v 1.1 2010/02/28 11:49:44 martin Exp $ */ +/* $NetBSD: tda.c,v 1.2 2010/03/01 22:53:09 martin Exp $ */ /* $OpenBSD: tda.c,v 1.4 2008/02/27 17:25:00 robert Exp $ */ /* @@ -200,7 +200,8 @@ return; } - aprint_debug_dev(sc-sc_dev, current temperature: cpu %lu system %lu\n, + aprint_debug_dev(sc-sc_dev, current temperature: cpu % PRIu64 + system % PRIu64 \n, ctemp, stemp); if (ctemp CPU_TEMP_MIN)
Re: CVS commit: src/crypto/external/bsd/netpgp/dist/src/hkpd
not really, i tried to shoehorn all of this into bozo, and it wasn't willing to do it, and its cgi subsystem doesn't lend itself to this kind of thing. i'm fairly intimate with most of bozo's internals, too. the server itself is not that large. if there's a common server-side library that can be used, great, show me it, and i'll convert the hkpd to use it. libfetch certainly isn't up to the task. regards, alistair On Mon, Mar 01, 2010 at 10:35:20PM +0100, Joerg Sonnenberger wrote: Why do we want to have another ad-hoc HTTP implementation? Wouldn't a small *CGI script be good enough? Joerg On Mon, Mar 01, 2010 at 07:41:57AM +, Alistair G. Crooks wrote: Module Name:src Committed By: agc Date: Mon Mar 1 07:41:57 UTC 2010 Added Files: src/crypto/external/bsd/netpgp/dist/src/hkpd: Makefile hkpd.c hkpd.h main.c Log Message: add an embryonic httpd key server (hkpd) to netpgp. this is based on the discontinued draft for hkp servers, in lieu of any official rfc. the post method for adding keys to the server has not been implemented. not until i've gone through all of the implications, anyway. hkp servers serve up pgp public keys over http. the default port is 11371, but it can be any port, specifiable at run time. whilst this hkpd will return valid html to browsers, it is aimed at the ''machine readable'' side, using the ''options=mr'' option to the http get string. this hkpd server will get hooked into the build at a later date. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/dist/src/hkpd/Makefile \ src/crypto/external/bsd/netpgp/dist/src/hkpd/hkpd.c \ src/crypto/external/bsd/netpgp/dist/src/hkpd/hkpd.h \ src/crypto/external/bsd/netpgp/dist/src/hkpd/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/crypto/external/bsd/netpgp/dist/src/hkpd
Joerg Sonnenberger wrote: Why do we want to have another ad-hoc HTTP implementation? Wouldn't a small *CGI script be good enough? Argument for a separate implementation: it runs as a standalone daemon on a different port than the default for HTTP, as a decoupled service from your normal httpd. Argument against: a CGI script would allow you too hook it into your favourite httpd, which could do all sorts of advanced stuff to requests before they hit the CGI script, like aliasing, rewriting, filtering, caching, etc.. Personally, I'd prefer a CGI script; though I do not at present desire to run a HKP server. I am satisfied with the various SKS servers out there. Cheers, -- Thomas E. Spanjaard t...@netphreax.net t...@deepbone.net signature.asc Description: OpenPGP digital signature
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: darran Date: Mon Mar 1 23:42:41 UTC 2010 Modified Files: src/external/cddl/osnet/sys/sys: sdt.h Log Message: DTrace: fix to only define sdt_provider_t if in the kernel. Not for user space. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/sdt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: darran
Date: Mon Mar 1 23:42:41 UTC 2010
Modified Files:
src/external/cddl/osnet/sys/sys: sdt.h
Log Message:
DTrace: fix to only define sdt_provider_t if in the kernel. Not for
user space.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/sys/sdt.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/sdt.h
diff -u src/external/cddl/osnet/sys/sys/sdt.h:1.4 src/external/cddl/osnet/sys/sys/sdt.h:1.5
--- src/external/cddl/osnet/sys/sys/sdt.h:1.4 Mon Mar 1 11:19:40 2010
+++ src/external/cddl/osnet/sys/sys/sdt.h Mon Mar 1 23:42:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdt.h,v 1.4 2010/03/01 11:19:40 darran Exp $ */
+/* $NetBSD: sdt.h,v 1.5 2010/03/01 23:42:41 darran Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek p...@freebsd.org
@@ -34,6 +34,7 @@
#include_next sys/sdt.h
#include sys/dtrace.h
+#ifdef _KERNEL
typedef struct {
char name[SDT_MAX_NAME_SIZE];
dtrace_provider_id_t id;
@@ -43,6 +44,7 @@
int sdt_register(sdt_provider_t *);
int sdt_unregister(sdt_provider_t *);
+#endif /* _KERNEL */
#undef DTRACE_PROBE
#undef DTRACE_PROBE1
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Mon Mar 1 23:53:26 UTC 2010 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: pmap_tlb.c Log Message: Fix KASSERT botch. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/mips/pmap_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Mon Mar 1 23:53:26 UTC 2010 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: pmap_tlb.c Log Message: Fix KASSERT botch. To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/mips/pmap_tlb.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_tlb.c diff -u src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.8 src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.9 --- src/sys/arch/mips/mips/pmap_tlb.c:1.1.2.8 Sun Feb 28 23:20:21 2010 +++ src/sys/arch/mips/mips/pmap_tlb.c Mon Mar 1 23:53:26 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_tlb.c,v 1.1.2.8 2010/02/28 23:20:21 matt Exp $ */ +/* $NetBSD: pmap_tlb.c,v 1.1.2.9 2010/03/01 23:53:26 matt Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap_tlb.c,v 1.1.2.8 2010/02/28 23:20:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap_tlb.c,v 1.1.2.9 2010/03/01 23:53:26 matt Exp $); /* * Manages address spaces in a TLB. @@ -409,7 +409,7 @@ * next called for this pmap, it will allocate a new * ASID. */ - KASSERT((pm-pm_onproc ti-ti_cpu_mask) == 0); + KASSERT((curlwp-l_proc-p_vmspace-vm_map.pmap-pm_onproc ti-ti_cpu_mask) == 0); pmap_pai_reset(ti, pai, PAI_PMAP(pai, ti)); } break;
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src
Committed By: matt
Date: Mon Mar 1 23:54:49 UTC 2010
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: locore.h
src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_subr.c
Log Message:
Add a chip-dependent hook to locorew which cpu_hatch will call to do some
initialization that can only be done while running on the local CPU.
To generate a diff of this commit:
cvs rdiff -u -r1.78.36.1.2.20 -r1.78.36.1.2.21 \
src/sys/arch/mips/include/locore.h
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/mips/cpu_subr.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/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.78.36.1.2.20 src/sys/arch/mips/include/locore.h:1.78.36.1.2.21
--- src/sys/arch/mips/include/locore.h:1.78.36.1.2.20 Mon Mar 1 19:29:41 2010
+++ src/sys/arch/mips/include/locore.h Mon Mar 1 23:54:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.78.36.1.2.20 2010/03/01 19:29:41 matt Exp $ */
+/* $NetBSD: locore.h,v 1.78.36.1.2.21 2010/03/01 23:54:49 matt Exp $ */
/*
* This file should not be included by MI code!!!
@@ -349,6 +349,7 @@
uintptr_t lsw_setfunc_trampoline;
int (*lsw_send_ipi)(struct cpu_info *, int);
void (*lsw_cpu_offline_md)(void);
+ void (*lsw_cpu_init)(struct cpu_info *);
};
struct mips_vmfreelist {
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.1.2.2 src/sys/arch/mips/mips/cpu_subr.c:1.1.2.3
--- src/sys/arch/mips/mips/cpu_subr.c:1.1.2.2 Mon Mar 1 19:29:41 2010
+++ src/sys/arch/mips/mips/cpu_subr.c Mon Mar 1 23:54:49 2010
@@ -32,7 +32,7 @@
#include opt_multiprocessor.h
#include opt_sa.h
-__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.1.2.2 2010/03/01 19:29:41 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.1.2.3 2010/03/01 23:54:49 matt Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -600,6 +600,12 @@
mips_icache_sync_all();
/*
+ * Let this CPU do its own initialization (for things that have to be
+ * done on the local CPU).
+ */
+ (*mips_locoresw.lsw_cpu_init)(ci);
+
+ /*
* Announce we are hatched
*/
atomic_or_ulong(cpus_hatched, cpu_mask);
CVS commit: [matt-nb5-mips64] src/sys/arch/mips
Module Name:src Committed By: matt Date: Mon Mar 1 23:54:49 UTC 2010 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: locore.h src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_subr.c Log Message: Add a chip-dependent hook to locorew which cpu_hatch will call to do some initialization that can only be done while running on the local CPU. To generate a diff of this commit: cvs rdiff -u -r1.78.36.1.2.20 -r1.78.36.1.2.21 \ src/sys/arch/mips/include/locore.h cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/mips/cpu_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [matt-nb5-mips64] src/sys/arch/sbmips
Module Name:src
Committed By: matt
Date: Mon Mar 1 23:55:49 UTC 2010
Modified Files:
src/sys/arch/sbmips/include [matt-nb5-mips64]: systemsw.h
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: cpu.c sb1250_icu.c
Log Message:
Add MP interrupts, IPIs, and secondary CPU spinup.
(compile tested only).
To generate a diff of this commit:
cvs rdiff -u -r1.7.28.3 -r1.7.28.4 src/sys/arch/sbmips/include/systemsw.h
cvs rdiff -u -r1.18.16.4 -r1.18.16.5 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.9.36.5 -r1.9.36.6 src/sys/arch/sbmips/sbmips/sb1250_icu.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/sbmips/include/systemsw.h
diff -u src/sys/arch/sbmips/include/systemsw.h:1.7.28.3 src/sys/arch/sbmips/include/systemsw.h:1.7.28.4
--- src/sys/arch/sbmips/include/systemsw.h:1.7.28.3 Tue Feb 23 20:24:37 2010
+++ src/sys/arch/sbmips/include/systemsw.h Mon Mar 1 23:55:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: systemsw.h,v 1.7.28.3 2010/02/23 20:24:37 matt Exp $ */
+/* $NetBSD: systemsw.h,v 1.7.28.4 2010/03/01 23:55:49 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -56,6 +56,7 @@
bool system_set_clockfns(void *, void (*)(void *));
void sb1250_icu_init(void);
+void sb1250_cpu_init(struct cpu_info *);
#define cpu_intr_establish(n,s,f,a) ((*systemsw.s_intr_establish)(n,s,f,a))
Index: src/sys/arch/sbmips/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.18.16.4 src/sys/arch/sbmips/sbmips/cpu.c:1.18.16.5
--- src/sys/arch/sbmips/sbmips/cpu.c:1.18.16.4 Sun Feb 28 23:46:18 2010
+++ src/sys/arch/sbmips/sbmips/cpu.c Mon Mar 1 23:55:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.18.16.4 2010/02/28 23:46:18 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.18.16.5 2010/03/01 23:55:49 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.18.16.4 2010/02/28 23:46:18 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.18.16.5 2010/03/01 23:55:49 matt Exp $);
#include opt_multiprocessor.h
@@ -52,6 +52,7 @@
#include mips/sibyte/include/sb1250_regs.h
#include mips/sibyte/include/sb1250_scd.h
#include mips/sibyte/dev/sbscdvar.h
+#include mips/cfe/cfe_api.h
#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
@@ -61,7 +62,7 @@
CFATTACH_DECL_NEW(cpu, 0,
cpu_match, cpu_attach, NULL, NULL);
-static int found = 0;
+static u_int found = 0;
static int
cpu_match(device_t parent, cfdata_t match, void *aux)
@@ -121,23 +122,44 @@
(ci-ci_cpu_freq % 100) / 1,
ci-ci_cycles_per_hz, ci-ci_divisor_delay);
- /*
- * If we're the primary CPU, no more work to do; we're already
- * running!
- */
- aprint_normal(%s: , xname);
- cpu_identify(self);
} else {
#if defined(MULTIPROCESSOR)
+ int status;
ci = cpu_info_alloc(NULL, found);
KASSERT(ci);
- // * spinup
+
+ sb1250_cpu_init(ci);
+
+ status = cfe_cpu_start(ci-ci_cpuid, cpu_trampoline,
+ (long) ci-ci_data.cpu_idlelwp-l_md.md_utf, 0,
+ (long) ci);
+ if (status != 0) {
+ aprint_error(: CFE call to start failed: %d\n,
+ status);
+ }
+ const u_long cpu_mask = 1L cpu_index(ci);
+ for (size_t i = 0; i 1; i++) {
+ if (cpus_hatched cpu_mask)
+ break;
+ DELAY(100);
+ }
+ if ((cpus_hatched cpu_mask) == 0) {
+ aprint_error(: failed to hatched!\n);
+ return;
+ }
#else
- aprint_normal(%s: processor off-line; multiprocessor support
- not present in kernel\n, xname);
+ aprint_normal_dev(self,
+ processor off-line;
+ multiprocessor support not present in kernel\n);
return;
#endif
}
+ /*
+ * Announce ourselves.
+ */
+ aprint_normal(%s: , xname);
+ cpu_identify(self);
+
cpu_attach_common(self, ci);
}
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.5 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.6
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.5 Sun Feb 28 03:32:23 2010
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Mon Mar 1 23:55:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.9.36.5 2010/02/28 03:32:23 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.9.36.6 2010/03/01 23:55:49 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,14 +33,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sb1250_icu.c,v 1.9.36.5 2010/02/28 03:32:23 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sb1250_icu.c,v 1.9.36.6 2010/03/01 23:55:49 matt Exp $);
#define __INTR_PRIVATE
#include sys/param.h
#include sys/systm.h
#include sys/device.h
-#include sys/malloc.h
+#include sys/kmem.h
/* XXX for uvmexp */
#include uvm/uvm_extern.h
@@ -48,7 +48,9 @@
#include machine/systemsw.h
#include mips/locore.h
-/* XXX for now, this copes with one cpu only, and assumes it's CPU 0 */
+#include mips/sibyte/include/sb1250_regs.h
+#include mips/sibyte/include/sb1250_int.h
+#include mips/sibyte/include/sb1250_scd.h
static const
CVS commit: [matt-nb5-mips64] src/sys/arch/sbmips
Module Name:src Committed By: matt Date: Mon Mar 1 23:55:49 UTC 2010 Modified Files: src/sys/arch/sbmips/include [matt-nb5-mips64]: systemsw.h src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: cpu.c sb1250_icu.c Log Message: Add MP interrupts, IPIs, and secondary CPU spinup. (compile tested only). To generate a diff of this commit: cvs rdiff -u -r1.7.28.3 -r1.7.28.4 src/sys/arch/sbmips/include/systemsw.h cvs rdiff -u -r1.18.16.4 -r1.18.16.5 src/sys/arch/sbmips/sbmips/cpu.c cvs rdiff -u -r1.9.36.5 -r1.9.36.6 src/sys/arch/sbmips/sbmips/sb1250_icu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/x86
Module Name:src
Committed By: jym
Date: Tue Mar 2 00:13:50 UTC 2010
Modified Files:
src/sys/arch/xen/x86: xen_bus_dma.c
Log Message:
Catch the return value from the XENMEM_decrease_reservation hypercall,
and not some error value stored earlier.
While here, fix a typo in a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/x86/xen_bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/x86/xen_bus_dma.c
diff -u src/sys/arch/xen/x86/xen_bus_dma.c:1.18 src/sys/arch/xen/x86/xen_bus_dma.c:1.19
--- src/sys/arch/xen/x86/xen_bus_dma.c:1.18 Sat Feb 27 09:22:40 2010
+++ src/sys/arch/xen/x86/xen_bus_dma.c Tue Mar 2 00:13:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_bus_dma.c,v 1.18 2010/02/27 09:22:40 jym Exp $ */
+/* $NetBSD: xen_bus_dma.c,v 1.19 2010/03/02 00:13:50 jym Exp $ */
/* NetBSD bus_dma.c,v 1.21 2005/04/16 07:53:35 yamt Exp */
/*-
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xen_bus_dma.c,v 1.18 2010/02/27 09:22:40 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: xen_bus_dma.c,v 1.19 2010/03/02 00:13:50 jym Exp $);
#include sys/param.h
#include sys/systm.h
@@ -81,7 +81,7 @@
npagesreq = (size PAGE_SHIFT);
KASSERT(npages = npagesreq);
- /* get npages from UWM, and give them back to the hypervisor */
+ /* get npages from UVM, and give them back to the hypervisor */
error = uvm_pglistalloc(((psize_t)npages) PAGE_SHIFT,
0, avail_end, 0, 0, mlistp, npages, (flags BUS_DMA_NOWAIT) == 0);
if (error)
@@ -96,8 +96,8 @@
res.nr_extents = 1;
res.extent_order = 0;
res.domid = DOMID_SELF;
- if (HYPERVISOR_memory_op(XENMEM_decrease_reservation, res)
- != 1) {
+ error = HYPERVISOR_memory_op(XENMEM_decrease_reservation, res);
+ if (error != 1) {
#ifdef DEBUG
printf(xen_alloc_contig: XENMEM_decrease_reservation
failed: err %d (pa %# PRIxPADDR mfn %#lx)\n,
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: jym Date: Tue Mar 2 00:13:50 UTC 2010 Modified Files: src/sys/arch/xen/x86: xen_bus_dma.c Log Message: Catch the return value from the XENMEM_decrease_reservation hypercall, and not some error value stored earlier. While here, fix a typo in a comment. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/x86/xen_bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src Committed By: darran Date: Tue Mar 2 00:43:36 UTC 2010 Modified Files: src/external/cddl/osnet/dist/uts/common/sys: dtrace.h Log Message: DTrace: fix the dtps_provide_module definition. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src
Committed By: darran
Date: Tue Mar 2 00:43:36 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/uts/common/sys: dtrace.h
Log Message:
DTrace: fix the dtps_provide_module definition.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.4 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.5
--- src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.4 Sat Feb 27 23:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Tue Mar 2 00:43:36 2010
@@ -2034,7 +2034,7 @@
typedef struct dtrace_pops {
void (*dtps_provide)(void *arg, const dtrace_probedesc_t *spec);
- void (*dtps_provide_module)(void *arg, struct modctl *mp);
+ void (*dtps_provide_module)(void *arg, dtrace_modctl_t *mp);
int (*dtps_enable)(void *arg, dtrace_id_t id, void *parg);
void (*dtps_disable)(void *arg, dtrace_id_t id, void *parg);
void (*dtps_suspend)(void *arg, dtrace_id_t id, void *parg);
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src Committed By: darran Date: Tue Mar 2 00:55:46 UTC 2010 Modified Files: src/external/cddl/osnet/dist/uts/common/sys: dtrace.h Log Message: DTrace: make sure we get a processorid_t definition (fix zfs module build). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
