CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Oct 2 07:04:17 UTC 2015 Modified Files: src/sys/dev/pci: pci_subr.c Log Message: Fix a bug that the TPH ST Table is wrongly decoded. Found by llvm. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/dev/pci/pci_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/dev/pci/pci_subr.c diff -u src/sys/dev/pci/pci_subr.c:1.135 src/sys/dev/pci/pci_subr.c:1.136 --- src/sys/dev/pci/pci_subr.c:1.135 Fri Oct 2 05:22:53 2015 +++ src/sys/dev/pci/pci_subr.c Fri Oct 2 07:04:17 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_subr.c,v 1.135 2015/10/02 05:22:53 msaitoh Exp $ */ +/* $NetBSD: pci_subr.c,v 1.136 2015/10/02 07:04:17 msaitoh Exp $ */ /* * Copyright (c) 1997 Zubin D. Dittia. All rights reserved. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.135 2015/10/02 05:22:53 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.136 2015/10/02 07:04:17 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_pci.h" @@ -2710,7 +2710,7 @@ pci_conf_print_tph_req_cap(const pcireg_ for (i = 0; i < size ; i += 2) { reg = regs[o2i(extcapoff + PCI_TPH_REQ_STTBL + i / 2)]; for (j = 0; j < 2 ; j++) { - uint16_t entry = reg; + uint32_t entry = reg; if (j != 0) entry >>= 16;
CVS commit: src/share/misc
Module Name:src Committed By: mbalmer Date: Fri Oct 2 09:01:23 UTC 2015 Modified Files: src/share/misc: airport Log Message: Fix case. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.59 src/share/misc/airport:1.60 --- src/share/misc/airport:1.59 Sun Sep 13 09:21:51 2015 +++ src/share/misc/airport Fri Oct 2 09:01:23 2015 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.59 2015/09/13 09:21:51 mbalmer Exp $ +# $NetBSD: airport,v 1.60 2015/10/02 09:01:23 mbalmer Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -7304,7 +7304,7 @@ STK:Sterling (Crosson Field), CO, USA STL:St. Louis/Lambert International, Missouri, USA STM:Santarem, PA, Brazil STN:London (Stansted), UK -STO:All Airports around Stockholm, Sweden +STO:All airports around Stockholm, Sweden STP:St. Paul (Holman Field), MN, USA STQ:St. Marys Municipal Airport, PA, USA STR:Stuttgart (Echterdingen), Germany
CVS commit: src/sys/arch/hpcmips/dev
Module Name:src Committed By: msaitoh Date: Fri Oct 2 09:05:33 UTC 2015 Modified Files: src/sys/arch/hpcmips/dev: plum.c Log Message: Fix comiple error. plum(4) is not PCI... To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/dev/plum.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/hpcmips/dev/plum.c diff -u src/sys/arch/hpcmips/dev/plum.c:1.15 src/sys/arch/hpcmips/dev/plum.c:1.16 --- src/sys/arch/hpcmips/dev/plum.c:1.15 Fri Oct 2 05:22:50 2015 +++ src/sys/arch/hpcmips/dev/plum.c Fri Oct 2 09:05:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: plum.c,v 1.15 2015/10/02 05:22:50 msaitoh Exp $ */ +/* $NetBSD: plum.c,v 1.16 2015/10/02 09:05:33 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.15 2015/10/02 05:22:50 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.16 2015/10/02 09:05:33 msaitoh Exp $"); #include #include @@ -172,9 +172,6 @@ plum_conf_read(bus_space_tag_t t, bus_sp { plumreg_t reg; - if ((unsigned int)o >= PCI_CONF_SIZE) - return (pcireg_t) -1; - reg = bus_space_read_4(t, h, o); return (reg); @@ -184,9 +181,6 @@ void plum_conf_write(bus_space_tag_t t, bus_space_handle_t h, int o, plumreg_t v) { - if ((unsigned int)o >= PCI_CONF_SIZE) - return; - bus_space_write_4(t, h, o, v); }
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: bouyer Date: Fri Oct 2 14:06:02 UTC 2015 Modified Files: src/sys/arch/arm/allwinner: awin_gpio.c Log Message: Print the port name when gpio(4) attaches, makes it much easier to find what port is connected to what gpio instance: gpio0 at awingpio0: 18 pins gpio0: port B gpio1 at awingpio0: 25 pins gpio1: port C gpio2 at awingpio0: 28 pins gpio2: port D gpio3 at awingpio0: 12 pins gpio3: port E gpio4 at awingpio0: 12 pins gpio4: port G gpio5 at awingpio0: 28 pins gpio5: port H gpio6 at awingpio0: 22 pins gpio6: port I To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/allwinner/awin_gpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/allwinner/awin_gpio.c diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.18 src/sys/arch/arm/allwinner/awin_gpio.c:1.19 --- src/sys/arch/arm/allwinner/awin_gpio.c:1.18 Mon Apr 20 01:33:22 2015 +++ src/sys/arch/arm/allwinner/awin_gpio.c Fri Oct 2 14:06:02 2015 @@ -35,7 +35,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.18 2015/04/20 01:33:22 matt Exp $"); +__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.19 2015/10/02 14:06:02 bouyer Exp $"); #include #include @@ -298,6 +298,7 @@ awin_gpio_config_pins(device_t self) for (u_int i = 0; i < __arraycount(pin_groups); i++) { struct awin_gpio_pin_group * const grp = &pin_groups[i]; uint32_t mask = grp->grp_pin_mask & ~grp->grp_pin_inuse_mask; + device_t gpio; /* * If this group has no bits to provide, skip it. @@ -323,7 +324,8 @@ awin_gpio_config_pins(device_t self) } gba.gba_npins = pin - gba.gba_pins; - config_found_ia(self, "gpiobus", &gba, gpiobus_print); + gpio = config_found_ia(self, "gpiobus", &gba, gpiobus_print); + aprint_normal_dev(gpio, "port %c\n", 'A' + i); } } #endif /* NGPIO > 0 */
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: bouyer Date: Fri Oct 2 16:04:40 UTC 2015 Modified Files: src/sys/arch/arm/allwinner: awin_gpio.c Log Message: Based on suggestion from jared, redo previous using a specific print callback to avoid the extra line. Now output looks like: gpio0 at awingpio0 port B: 18 pins gpio1 at awingpio0 port C: 25 pins gpio2 at awingpio0 port D: 28 pins gpio3 at awingpio0 port E: 12 pins gpio4 at awingpio0 port G: 12 pins gpio5 at awingpio0 port H: 28 pins gpio6 at awingpio0 port I: 22 pins To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/allwinner/awin_gpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/allwinner/awin_gpio.c diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.19 src/sys/arch/arm/allwinner/awin_gpio.c:1.20 --- src/sys/arch/arm/allwinner/awin_gpio.c:1.19 Fri Oct 2 14:06:02 2015 +++ src/sys/arch/arm/allwinner/awin_gpio.c Fri Oct 2 16:04:40 2015 @@ -35,7 +35,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.19 2015/10/02 14:06:02 bouyer Exp $"); +__KERNEL_RCSID(1, "$NetBSD: awin_gpio.c,v 1.20 2015/10/02 16:04:40 bouyer Exp $"); #include #include @@ -81,6 +81,7 @@ static struct awin_gpio_pin_group { bus_space_handle_t grp_bsh; struct awin_gpio_pin_cfg grp_cfg; struct gpio_chipset_tag grp_gc_tag; + const int grp_index; const char grp_nc_name[6]; } pin_groups[] = { [0] = { @@ -92,6 +93,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 0, .grp_nc_name = "nc-pa", }, [1] = { @@ -103,6 +105,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 1, .grp_nc_name = "nc-pb", }, [2] = { @@ -114,6 +117,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 2, .grp_nc_name = "nc-pc", }, [3] = { @@ -125,6 +129,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 3, .grp_nc_name = "nc-pd", }, [4] = { @@ -136,6 +141,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 4, .grp_nc_name = "nc-pe", }, [5] = { @@ -147,6 +153,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 5, .grp_nc_name = "nc-pf", }, [6] = { @@ -158,6 +165,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 6, .grp_nc_name = "nc-pg", }, [7] = { @@ -169,6 +177,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 7, .grp_nc_name = "nc-ph", }, [8] = { @@ -180,6 +189,7 @@ static struct awin_gpio_pin_group { .gp_pin_write = awin_gpio_pin_write, .gp_pin_ctl = awin_gpio_pin_ctl, }, + .grp_index = 8, .grp_nc_name = "nc-pi", }, [9] = { @@ -191,6 +201,7 @@ static struct awin_gpio_pin_group { .gp_pin_ctl = awin_gpio_pin_ctl, }, .grp_pin_mask = 0, + .grp_index = 9, .grp_nc_name = "nc-pj", }, [10] = { @@ -202,6 +213,7 @@ static struct awin_gpio_pin_group { .gp_pin_ctl = awin_gpio_pin_ctl, }, .grp_pin_mask = 0, + .grp_index = 10, .grp_nc_name = "nc-pk", }, [11] = { @@ -213,6 +225,7 @@ static struct awin_gpio_pin_group { .gp_pin_ctl = awin_gpio_pin_ctl, }, .grp_pin_mask = 0, + .grp_index = 11, .grp_nc_name = "nc-pl", }, [12] = { @@ -224,6 +237,7 @@ static struct awin_gpio_pin_group { .gp_pin_ctl = awin_gpio_pin_ctl, }, .grp_pin_mask = 0, + .grp_index = 12, .grp_nc_name = "nc-pm", }, [13] = { @@ -268,6 +282,20 @@ awin_gpio_match(device_t parent, cfdata_ } #if NGPIO > 0 +static int +awin_gpio_cfprint(void *priv, const char *pnp) +{ + struct gpiobus_attach_args *gba = priv; + struct awin_gpio_pin_group *grp = gba->gba_gc->gp_cookie; + + if (pnp) + aprint_normal("gpiobus at %s", pnp); + + aprint_normal(" port %c", 'A' + grp->grp_index); + + return UNCONF; +} + static void awin_gpio_config_pins(device_t self) { @@ -298,7 +326,6 @@ awin_gpio_config_pins(device_t self) for (u_int i = 0; i < __arraycount(pin_groups); i++) { struct awin_gpio_pin_group * const grp = &pin_groups[i]; uint32_t mask = grp->grp_pin_mask & ~grp->grp_pin_inuse_mask; - device_t gpio; /* * If this group has no bits to provide, skip it. @@ -324,8 +351,7 @@ awin_gpio_config_pins(device_t self) } gba.gba_npins = pin - gba.gba_pins; - gpio = config_found_ia(self, "gpiobus", &gba, gpiobus_print); - aprint_normal_dev
CVS commit: src/sys
Module Name:src Committed By: christos Date: Fri Oct 2 16:54:15 UTC 2015 Modified Files: src/sys/kern: kern_exec.c kern_exit.c kern_fork.c kern_lwp.c kern_sdt.c kern_sig.c sys_sig.c vfs_cache.c src/sys/sys: sdt.h Log Message: Change SDT (Statically Defined Tracing) probes to use link sets so that it is easier to add probes. (From FreeBSD) To generate a diff of this commit: cvs rdiff -u -r1.417 -r1.418 src/sys/kern/kern_exec.c cvs rdiff -u -r1.244 -r1.245 src/sys/kern/kern_exit.c cvs rdiff -u -r1.193 -r1.194 src/sys/kern/kern_fork.c cvs rdiff -u -r1.179 -r1.180 src/sys/kern/kern_lwp.c cvs rdiff -u -r1.1 -r1.2 src/sys/kern/kern_sdt.c cvs rdiff -u -r1.319 -r1.320 src/sys/kern/kern_sig.c cvs rdiff -u -r1.44 -r1.45 src/sys/kern/sys_sig.c cvs rdiff -u -r1.107 -r1.108 src/sys/kern/vfs_cache.c cvs rdiff -u -r1.5 -r1.6 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/sys/kern/kern_exec.c diff -u src/sys/kern/kern_exec.c:1.417 src/sys/kern/kern_exec.c:1.418 --- src/sys/kern/kern_exec.c:1.417 Sat Sep 26 12:12:24 2015 +++ src/sys/kern/kern_exec.c Fri Oct 2 12:54:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.417 2015/09/26 16:12:24 maxv Exp $ */ +/* $NetBSD: kern_exec.c,v 1.418 2015/10/02 16:54:15 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.417 2015/09/26 16:12:24 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.418 2015/10/02 16:54:15 christos Exp $"); #include "opt_exec.h" #include "opt_execfmt.h" @@ -148,18 +148,10 @@ static void dump_vmcmds(const struct exe /* * DTrace SDT provider definitions */ -SDT_PROBE_DEFINE(proc,,,exec,exec, - "char *", NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); -SDT_PROBE_DEFINE(proc,,,exec_success,exec-success, - "char *", NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); -SDT_PROBE_DEFINE(proc,,,exec_failure,exec-failure, - "int", NULL, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); +SDT_PROVIDER_DECLARE(proc); +SDT_PROBE_DEFINE1(proc, kernel, , exec, "char *"); +SDT_PROBE_DEFINE1(proc, kernel, , exec__success, "char *"); +SDT_PROBE_DEFINE1(proc, kernel, , exec__failure, "int"); /* * Exec function switch: @@ -660,7 +652,7 @@ execve_loadvm(struct lwp *l, const char p = l->l_proc; modgen = 0; - SDT_PROBE(proc,,,exec, path, 0, 0, 0, 0); + SDT_PROBE(proc, kernel, , exec, path, 0, 0, 0, 0); /* * Check if we have exceeded our number of processes limit. @@ -822,7 +814,7 @@ execve_loadvm(struct lwp *l, const char goto retry; } - SDT_PROBE(proc,,,exec_failure, error, 0, 0, 0, 0); + SDT_PROBE(proc, kernel, , exec__failure, error, 0, 0, 0, 0); return error; } @@ -1265,7 +1257,7 @@ execve_runproc(struct lwp *l, struct exe kmem_free(epp->ep_hdr, epp->ep_hdrlen); - SDT_PROBE(proc,,,exec_success, epp->ep_kname, 0, 0, 0, 0); + SDT_PROBE(proc, kernel, , exec__success, epp->ep_kname, 0, 0, 0, 0); emulexec(l, epp); @@ -1316,7 +1308,7 @@ execve_runproc(struct lwp *l, struct exe return EJUSTRETURN; exec_abort: - SDT_PROBE(proc,,,exec_failure, error, 0, 0, 0, 0); + SDT_PROBE(proc, kernel, , exec__failure, error, 0, 0, 0, 0); rw_exit(&p->p_reflock); if (!no_local_exec_lock) rw_exit(&exec_lock); Index: src/sys/kern/kern_exit.c diff -u src/sys/kern/kern_exit.c:1.244 src/sys/kern/kern_exit.c:1.245 --- src/sys/kern/kern_exit.c:1.244 Mon May 5 11:45:32 2014 +++ src/sys/kern/kern_exit.c Fri Oct 2 12:54:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exit.c,v 1.244 2014/05/05 15:45:32 christos Exp $ */ +/* $NetBSD: kern_exit.c,v 1.245 2015/10/02 16:54:15 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -67,9 +67,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.244 2014/05/05 15:45:32 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.245 2015/10/02 16:54:15 christos Exp $"); #include "opt_ktrace.h" +#include "opt_dtrace.h" #include "opt_perfctrs.h" #include "opt_sysv.h" @@ -123,10 +124,9 @@ static void proc_free(struct proc *, str /* * DTrace SDT provider definitions */ -SDT_PROBE_DEFINE(proc,,,exit,exit, - "int", NULL, /* reason */ - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); +SDT_PROVIDER_DECLARE(proc); +SDT_PROBE_DEFINE1(proc, kernel, , exit, "int"); + /* * Fill in the appropriate signal information, and signal the parent. */ @@ -414,7 +414,7 @@ exit1(struct lwp *l, int rv) */ KNOTE(&p->p_klist, NOTE_EXIT); - SDT_PROBE(proc,,,exit, + SDT_PROBE(proc, kernel, , exit, (WCOREDUMP(rv) ? CLD_DUMPED : (WIFSIGNALED(rv) ? CLD_KILLED : CLD_EXITED)), 0,0,0,0); Index: src/sys/kern/kern_fork.c diff -u src/sys/kern/kern_fork.c:1.193 src/sys/kern/kern_fork.c:1.194 --- src/sys
CVS import: src/external/cddl/osnet/dev/sdt
Module Name:src Committed By: christos Date: Fri Oct 2 16:56:18 UTC 2015 Update of /cvsroot/src/external/cddl/osnet/dev/sdt In directory ivanova.netbsd.org:/tmp/cvs-serv15090 Log Message: Import sdt.c from FreeBSD Status: Vendor Tag: FreeBSD Release Tags: FreeBSD-2015-09-29 C src/external/cddl/osnet/dev/sdt/sdt.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jFreeBSD:yesterday -jFreeBSD src/external/cddl/osnet/dev/sdt
CVS commit: src/external/cddl/osnet/dev/sdt
Module Name:src Committed By: christos Date: Fri Oct 2 16:59:24 UTC 2015 Modified Files: src/external/cddl/osnet/dev/sdt: sdt.c Log Message: Adapt to NetBSD modules and link set access. XXX: We don't have an event system so that we can issue callback that will be run on construction or destruction to enable and disable probes XXX: We don't have a way to use link_sets across modules properly. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 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.12 src/external/cddl/osnet/dev/sdt/sdt.c:1.13 --- src/external/cddl/osnet/dev/sdt/sdt.c:1.12 Wed Sep 30 16:59:44 2015 +++ src/external/cddl/osnet/dev/sdt/sdt.c Fri Oct 2 12:59:23 2015 @@ -1,74 +1,91 @@ -/* $NetBSD: sdt.c,v 1.12 2015/09/30 20:59:44 christos Exp $ */ - -/*- - * Copyright (c) 2010 The NetBSD Foundation, Inc. - * All rights reserved. +/* + * 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. * - * 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. + * 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] * - * 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. + * CDDL HEADER END * + * Portions Copyright 2006-2008 John Birrell j...@freebsd.org + * + * $FreeBSD: head/sys/cddl/dev/sdt/sdt.c 285703 2015-07-19 22:14:09Z markj $ * - * 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. */ -#ifdef _KERNEL_OPT -#include "opt_dtrace.h" -#endif +/* + * This file contains a reimplementation of the statically-defined tracing (SDT) + * framework for DTrace. Probes and SDT providers are defined using the macros + * in sys/sdt.h, which append all the needed structures to linker sets. When + * this module is loaded, it iterates over all of the loaded modules and + * registers probes and providers with the DTrace framework based on the + * contents of these linker sets. + * + * A list of SDT providers is maintained here since a provider may span multiple + * modules. When a kernel module is unloaded, a provider defined in that module + * is unregistered only if no other modules refer to it. The DTrace framework is + * responsible for destroying individual probes when a kernel module is + * unloaded; in particular, probes may not span multiple kernel modules. + */ #include #include #include + #include +#include #include -#include +#include +#include +#include +#include +#include +#include #include #include - -#include - -#define KDTRACE_HOOKS +#include #include -#undef SDT_DEBUG - -static dev_type_open(sdt_open); +#include +#include -static int sdt_unload(void); +/* DTrace methods. */ static void sdt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); -static void sdt_provide(void *, const dtrace_probedesc_t *); +static void sdt_provi
CVS commit: src/external/cddl/osnet/dev/sdt
Module Name:src Committed By: christos Date: Fri Oct 2 17:13:32 UTC 2015 Modified Files: src/external/cddl/osnet/dev/sdt: sdt.c Log Message: Merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 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.13 src/external/cddl/osnet/dev/sdt/sdt.c:1.14 --- src/external/cddl/osnet/dev/sdt/sdt.c:1.13 Fri Oct 2 12:59:23 2015 +++ src/external/cddl/osnet/dev/sdt/sdt.c Fri Oct 2 13:13:32 2015 @@ -38,23 +38,33 @@ * responsible for destroying individual probes when a kernel module is * unloaded; in particular, probes may not span multiple kernel modules. */ +#include +__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.14 2015/10/02 17:13:32 christos Exp $"); #include #include #include #include +#ifdef __FreeBSD__ #include +#endif #include #include +#ifdef __FreeBSD__ #include #include +#endif #include +#ifdef __FreeBSD__ #include +#endif #include +#include #include #include #include +#define KDTRACE_HOOKS #include #include @@ -62,19 +72,23 @@ /* DTrace methods. */ static void sdt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); -static void sdt_provide_probes(void *, dtrace_probedesc_t *); +static void sdt_provide_probes(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); static int sdt_unload(void); static void sdt_create_provider(struct sdt_provider *); static void sdt_create_probe(struct sdt_probe *); +#ifdef __FreeBSD__ static void sdt_kld_load(void *, struct linker_file *); static void sdt_kld_unload_try(void *, struct linker_file *, int *); +#endif -static MALLOC_DEFINE(M_SDT, "SDT", "DTrace SDT providers"); +MALLOC_DECLARE(M_SDT); +MALLOC_DEFINE(M_SDT, "SDT", "DTrace SDT providers"); +#define SDT_KASSERT(cond, msg) KASSERT(cond) static dtrace_pattr_t sdt_attr = { { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON }, @@ -97,10 +111,37 @@ static dtrace_pops_t sdt_pops = { sdt_destroy, }; +#ifdef __NetBSD__ +static int +sdt_open(dev_t dev, int flags, int mode, struct lwp *l) +{ + return (0); +} + +static const struct cdevsw sdt_cdevsw = { + sdt_open, noclose, noread, nowrite, noioctl, + nostop, notty, nopoll, nommap, nokqfilter, nodiscard, + D_OTHER +}; +#endif + static TAILQ_HEAD(, sdt_provider) sdt_prov_list; +#ifdef __FreeBSD__ eventhandler_tag sdt_kld_load_tag; eventhandler_tag sdt_kld_unload_try_tag; +#endif + +#ifdef __NetBSD__ +static char * +strdup(const char *s, const struct malloc_type *m) +{ + size_t l = strlen(s) + 1; + char *d = malloc(l, m, M_WAITOK); + memcpy(d, s, l); + return d; +} +#endif static void sdt_create_provider(struct sdt_provider *prov) @@ -145,14 +186,16 @@ sdt_create_probe(struct sdt_probe *probe if (strcmp(prov->name, probe->prov->name) == 0) break; - KASSERT(prov != NULL, ("probe defined without a provider")); + SDT_KASSERT(prov != NULL, ("probe defined without a provider")); +#ifdef __FreeBSD__ /* If no module name was specified, use the module filename. */ if (*probe->mod == 0) { len = strlcpy(mod, probe->sdtp_lf->filename, sizeof(mod)); if (len > 3 && strcmp(mod + len - 3, ".ko") == 0) mod[len - 3] = '\0'; } else +#endif strlcpy(mod, probe->mod, sizeof(mod)); /* @@ -187,19 +230,26 @@ sdt_create_probe(struct sdt_probe *probe * requires one of provide_probes and provide_module to be defined. */ static void -sdt_provide_probes(void *arg, dtrace_probedesc_t *desc) +sdt_provide_probes(void *arg, const dtrace_probedesc_t *desc) { } -static void +static int sdt_enable(void *arg __unused, dtrace_id_t id, void *parg) { struct sdt_probe *probe = parg; +#ifdef SDT_DEBUG + printf("sdt: %s\n", __func__); +#endif + probe->id = id; +#ifdef __FreeBSD__ probe->sdtp_lf->nenabled++; if (strcmp(probe->prov->name, "lockstat") == 0) lockstat_enabled++; +#endif + return 1; } static void @@ -207,12 +257,18 @@ sdt_disable(void *arg __unused, dtrace_i { struct sdt_probe *probe = parg; - KASSERT(probe->sdtp_lf->nenabled > 0, ("no probes enabled")); + SDT_KASSERT(probe->sdtp_lf->nenabled > 0, ("no probes enabled")); + +#ifdef SDT_DEBUG + printf("sdt: %s\n", __func__); +#endif +#ifdef __FreeBSD__ if (strcmp(probe->prov->name, "lockstat") == 0) lockstat_enabled--; - probe->id = 0; probe->sdtp_lf->nenabled--; +#endif + probe->id = 0; } static void @@ -221,6 +277,16 @@ sdt_getargdesc(void *arg, dtrace_id_t id struct sdt_argtype *argtype; struct sdt_probe *probe = parg; +#ifdef SDT_DEBUG + printf("
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Fri Oct 2 17:13:58 UTC 2015 Modified Files: src/external/cddl/osnet/sys/sys: sdt.h Log Message: we don't need any of this now. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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.5 src/external/cddl/osnet/sys/sys/sdt.h:1.6 --- src/external/cddl/osnet/sys/sys/sdt.h:1.5 Mon Mar 1 18:42:41 2010 +++ src/external/cddl/osnet/sys/sys/sdt.h Fri Oct 2 13:13:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sdt.h,v 1.5 2010/03/01 23:42:41 darran Exp $ */ +/* $NetBSD: sdt.h,v 1.6 2015/10/02 17:13:58 christos Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -34,37 +34,4 @@ #include_next #include -#ifdef _KERNEL -typedef struct { -char name[SDT_MAX_NAME_SIZE]; -dtrace_provider_id_t id; -dtrace_pattr_t attr; -sdt_probe_t *probes[]; -} sdt_provider_t; - -int sdt_register(sdt_provider_t *); -int sdt_unregister(sdt_provider_t *); -#endif /* _KERNEL */ - -#undef DTRACE_PROBE -#undef DTRACE_PROBE1 -#undef DTRACE_PROBE2 -#undef DTRACE_PROBE3 -#undef DTRACE_PROBE4 -#undef DTRACE_PROBE5 -#undef DTRACE_PROBE6 -#undef DTRACE_PROBE7 - -#define DTRACE_PROBE(name) -#define DTRACE_PROBE1(name, type1, arg1) -#define DTRACE_PROBE2(name, type1, arg1, type2, arg2) -#define DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3) -#define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) -#define DTRACE_PROBE5(name, type1, arg1, type2, arg2, type3, arg3, \ - type4, arg4, type5, arg5) -#define DTRACE_PROBE6(name, type1, arg1, type2, arg2, type3, arg3, \ - type4, arg4, type5, arg5, type6, arg6) -#define DTRACE_PROBE7(name, type1, arg1, type2, arg2, type3, arg3, \ - type4, arg4, type5, arg5, type6, arg6, type7, arg7) - #endif /* _OPENSOLARIS_SYS_SDT_H_ */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Fri Oct 2 17:28:57 UTC 2015 Modified Files: src/external/cddl/osnet/sys/sys: sdt.h Log Message: put back the DTRACE macros To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 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.6 src/external/cddl/osnet/sys/sys/sdt.h:1.7 --- src/external/cddl/osnet/sys/sys/sdt.h:1.6 Fri Oct 2 13:13:58 2015 +++ src/external/cddl/osnet/sys/sys/sdt.h Fri Oct 2 13:28:57 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: sdt.h,v 1.6 2015/10/02 17:13:58 christos Exp $ */ +/* $NetBSD: sdt.h,v 1.7 2015/10/02 17:28:57 christos Exp $ */ /*- * Copyright (c) 2007 Pawel Jakub Dawidek @@ -33,5 +33,26 @@ #include_next #include + +#undef DTRACE_PROBE +#undef DTRACE_PROBE1 +#undef DTRACE_PROBE2 +#undef DTRACE_PROBE3 +#undef DTRACE_PROBE4 +#undef DTRACE_PROBE5 +#undef DTRACE_PROBE6 +#undef DTRACE_PROBE7 + +#define DTRACE_PROBE(name) +#define DTRACE_PROBE1(name, type1, arg1) +#define DTRACE_PROBE2(name, type1, arg1, type2, arg2) +#define DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3) +#define DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4) +#define DTRACE_PROBE5(name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5) +#define DTRACE_PROBE6(name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5, type6, arg6) +#define DTRACE_PROBE7(name, type1, arg1, type2, arg2, type3, arg3, \ + type4, arg4, type5, arg5, type6, arg6, type7, arg7) #endif /* _OPENSOLARIS_SYS_SDT_H_ */
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Fri Oct 2 19:47:08 UTC 2015 Modified Files: src/sys/kern: kern_time.c syscalls.master Log Message: PR/50295: clock_nanotime() should not set errno, but return the error. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/sys/kern/kern_time.c cvs rdiff -u -r1.278 -r1.279 src/sys/kern/syscalls.master 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_time.c diff -u src/sys/kern/kern_time.c:1.180 src/sys/kern/kern_time.c:1.181 --- src/sys/kern/kern_time.c:1.180 Fri Jul 24 09:02:52 2015 +++ src/sys/kern/kern_time.c Fri Oct 2 15:47:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_time.c,v 1.180 2015/07/24 13:02:52 maxv Exp $ */ +/* $NetBSD: kern_time.c,v 1.181 2015/10/02 19:47:08 christos Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.180 2015/07/24 13:02:52 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.181 2015/10/02 19:47:08 christos Exp $"); #include #include @@ -310,15 +310,19 @@ sys_clock_nanosleep(struct lwp *l, const error = copyin(SCARG(uap, rqtp), &rqt, sizeof(struct timespec)); if (error) - return (error); + goto out; error = nanosleep1(l, SCARG(uap, clock_id), SCARG(uap, flags), &rqt, SCARG(uap, rmtp) ? &rmt : NULL); if (SCARG(uap, rmtp) == NULL || (error != 0 && error != EINTR)) + goto out; return error; - error1 = copyout(&rmt, SCARG(uap, rmtp), sizeof(rmt)); - return error1 ? error1 : error; + if ((error1 = copyout(&rmt, SCARG(uap, rmtp), sizeof(rmt))) != 0) + error = error1; +out: + *retval = error; + return 0; } int Index: src/sys/kern/syscalls.master diff -u src/sys/kern/syscalls.master:1.278 src/sys/kern/syscalls.master:1.279 --- src/sys/kern/syscalls.master:1.278 Thu Jun 18 11:16:12 2015 +++ src/sys/kern/syscalls.master Fri Oct 2 15:47:08 2015 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp $ + $NetBSD: syscalls.master,v 1.279 2015/10/02 19:47:08 christos Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -981,7 +981,7 @@ struct timespec *timeout); } 476 STD RUMP { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, \ unsigned int vlen, unsigned int flags); } -477 STD RUMP { int|sys||clock_nanosleep(clockid_t clock_id, \ +477 NOERR RUMP { int|sys||clock_nanosleep(clockid_t clock_id, \ int flags, const struct timespec *rqtp, \ struct timespec *rmtp); } 478 STD { int|sys|60|_lwp_park(clockid_t clock_id, int flags, \
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Fri Oct 2 19:52:50 UTC 2015 Modified Files: src/lib/libc/sys: nanosleep.2 Log Message: PR/50295: Fix clock_nanosleep return value documentation. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libc/sys/nanosleep.2 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/sys/nanosleep.2 diff -u src/lib/libc/sys/nanosleep.2:1.16 src/lib/libc/sys/nanosleep.2:1.17 --- src/lib/libc/sys/nanosleep.2:1.16 Sun Feb 2 03:31:49 2014 +++ src/lib/libc/sys/nanosleep.2 Fri Oct 2 15:52:49 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: nanosleep.2,v 1.16 2014/02/02 08:31:49 wiz Exp $ +.\" $NetBSD: nanosleep.2,v 1.17 2015/10/02 19:52:49 christos Exp $ .\" .\" Copyright (c) 1986, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sleep.3 8.1 (Berkeley) 6/4/93 .\" -.Dd February 1, 2014 +.Dd October 2, 2015 .Dt NANOSLEEP 2 .Os .Sh NAME @@ -111,8 +111,11 @@ If the .Fn clock_nanosleep or the .Fn nanosleep -functions return due to the delivery of a signal, the value returned -will be \-1, and the global variable +functions return due to the delivery of a signal, then +.Fn clock_nanosleep +will return directly the error number, and +.Fn nanosleep +will return \-1, and the global variable .Va errno will be set to indicate the interruption. If @@ -123,10 +126,12 @@ the timespec structure it references is unslept amount (the request time minus the time actually slept). .Sh ERRORS If any of the following conditions occur, the -.Nm +.Fn nanosleep function shall return \-1 and set .Va errno -to the corresponding value. +to the corresponding value, and the +.Fn clock_nanosleep +function shall return the errnor number directly. .Bl -tag -width Er .It Bq Er EFAULT Either
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src Committed By: joerg Date: Fri Oct 2 20:36:54 UTC 2015 Modified Files: src/sys/arch/sparc/stand/ofwboot: Makefile Log Message: Support per-target AFLAGS. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sparc/stand/ofwboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/stand/ofwboot/Makefile diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.33 src/sys/arch/sparc/stand/ofwboot/Makefile:1.34 --- src/sys/arch/sparc/stand/ofwboot/Makefile:1.33 Sun Jan 11 22:59:25 2015 +++ src/sys/arch/sparc/stand/ofwboot/Makefile Fri Oct 2 20:36:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2015/01/11 22:59:25 martin Exp $ +# $NetBSD: Makefile,v 1.34 2015/10/02 20:36:54 joerg Exp $ CURDIR= ${.CURDIR} S= ${CURDIR}/../../../.. @@ -123,7 +123,7 @@ CEXTRAFLAGS?= -D_LP64 AFLAGS+= -x assembler-with-cpp -D_LOCORE -D__ELF__ ${CEXTRAFLAGS} .endif -NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< +NORMAL_S= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} -c $< srt0.o: srt0.s ${NORMAL_S}
CVS commit: src/usr.sbin/tadpolectl
Module Name:src Committed By: joerg Date: Fri Oct 2 20:42:16 UTC 2015 Modified Files: src/usr.sbin/tadpolectl: tadpolectl.c Log Message: Make usage static and dead. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/tadpolectl/tadpolectl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/tadpolectl/tadpolectl.c diff -u src/usr.sbin/tadpolectl/tadpolectl.c:1.8 src/usr.sbin/tadpolectl/tadpolectl.c:1.9 --- src/usr.sbin/tadpolectl/tadpolectl.c:1.8 Thu Apr 30 16:10:10 2009 +++ src/usr.sbin/tadpolectl/tadpolectl.c Fri Oct 2 20:42:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tadpolectl.c,v 1.8 2009/04/30 16:10:10 nakayama Exp $ */ +/* $NetBSD: tadpolectl.c,v 1.9 2015/10/02 20:42:15 joerg Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ int aflag, nflag, wflag, dev; #define PROTO(x) int x __P((int, int, int)); -void usage __P((void)); +static void usage __P((void)) __dead; static void parse __P((char *)); char *dashdot __P((const char *)); int main __P((int, char *[])); @@ -663,8 +663,8 @@ FUNC(hw_serial_power) return(1); } -void -usage() +static void +usage(void) { (void)fprintf(stderr, "usage: tadpolectl [-n] name ...\n"
CVS commit: src/external/cddl/osnet/dev/dtrace/arm
Module Name:src Committed By: riz Date: Fri Oct 2 22:15:18 UTC 2015 Modified Files: src/external/cddl/osnet/dev/dtrace/arm: dtrace_isa.c Log Message: Update signature of unimplemented function to match prototype. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.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/dtrace/arm/dtrace_isa.c diff -u src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.4 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.5 --- src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.4 Sat Mar 15 07:43:01 2014 +++ src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c Fri Oct 2 22:15:18 2015 @@ -225,7 +225,7 @@ dtrace_getstackdepth(int aframes) } ulong_t -dtrace_getreg(struct regs *regs, uint_t reg) +dtrace_getreg(struct trapframe *rp, uint_t reg) { return (0);
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: riz Date: Fri Oct 2 22:17:22 UTC 2015 Modified Files: src/distrib/sets/lists/debug: ad.arm Log Message: Fix up setlists for new debug compat libs. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/debug/ad.arm 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/debug/ad.arm diff -u src/distrib/sets/lists/debug/ad.arm:1.72 src/distrib/sets/lists/debug/ad.arm:1.73 --- src/distrib/sets/lists/debug/ad.arm:1.72 Mon Jul 6 09:17:24 2015 +++ src/distrib/sets/lists/debug/ad.arm Fri Oct 2 22:17:22 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.72 2015/07/06 09:17:24 matt Exp $ +# $NetBSD: ad.arm,v 1.73 2015/10/02 22:17:22 riz Exp $ ./usr/lib/libarm_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/libc_vfp_g.acomp-c-debuglib debuglib,softfloat ./usr/lib/libpmc_g.acomp-c-debuglib debuglib,compatfile @@ -14,6 +14,8 @@ ./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic,softfloat ./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug comp-sys-debug debug,pic,compatfile ./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug comp-sys-debug debug,compat,pic +./usr/libdata/debug/usr/lib/oabi/libproc.so.0.0.debug comp-sys-debug debug,compat,dtrace +./usr/libdata/debug/usr/lib/oabi/librtld_db.so.0.0.debug comp-sys-debug debug,compat,dtrace ./usr/libdata/debug/usr/libexec/ld.elf_so-oabi comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
CVS commit: src/external/cddl/osnet/dist/uts/common/sys
Module Name:src Committed By: riz Date: Fri Oct 2 22:16:39 UTC 2015 Modified Files: src/external/cddl/osnet/dist/uts/common/sys: dtrace.h Log Message: Restore some defines lost in last update, and don't include sys/cpuvar.h MKDTRACE=yes now builds for arm platforms again. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ 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.13 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.14 --- src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.13 Thu Sep 24 19:55:00 2015 +++ src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Fri Oct 2 22:16:38 2015 @@ -57,7 +57,6 @@ extern "C" { #ifdef illumos #include #else -#include #include #include #include @@ -2450,6 +2449,18 @@ extern void dtrace_helpers_destroy(proc_ #define DTRACE_INVOP_POPM 2 #define DTRACE_INVOP_B 3 +#define DTRACE_INVOP_MOV_IP_SP 1 +#define DTRACE_INVOP_BX_LR 2 +#define DTRACE_INVOP_MOV_PC_LR 3 +#define DTRACE_INVOP_LDM 4 +#define DTRACE_INVOP_LDMIB 5 +#define DTRACE_INVOP_LDR_IMM 6 +#define DTRACE_INVOP_MOVW 7 +#define DTRACE_INVOP_MOV_IMM 8 +#define DTRACE_INVOP_CMP_IMM 9 +#define DTRACE_INVOP_B_LABEL 10 +#define DTRACE_INVOP_PUSH 11 + #elif defined(__aarch64__) #define INSN_SIZE 4