svn commit: r264761 - in stable/10/sys/dev: puc uart
Author: marius
Date: Tue Apr 22 13:02:03 2014
New Revision: 264761
URL: http://svnweb.freebsd.org/changeset/base/264761
Log:
MFC: r264257, r264327, r264514
Distinguish between the different variants and configurations of Sunix
{MIO,SER}5 chips instead of treating all of them as PUC_PORT_2S.
Among others, this fixes the hang seen when trying to probe the none-
existent second UART on an actually 1-port chip.
Obtained from:NetBSD (BAR layouts)
Sponsored by: Bally Wulff Games & Entertainment GmbH
Modified:
stable/10/sys/dev/puc/pucdata.c
stable/10/sys/dev/uart/uart_bus_pci.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/puc/pucdata.c
==
--- stable/10/sys/dev/puc/pucdata.c Tue Apr 22 11:08:33 2014
(r264760)
+++ stable/10/sys/dev/puc/pucdata.c Tue Apr 22 13:02:03 2014
(r264761)
@@ -58,6 +58,7 @@ static puc_config_f puc_config_oxford_pc
static puc_config_f puc_config_quatech;
static puc_config_f puc_config_syba;
static puc_config_f puc_config_siig;
+static puc_config_f puc_config_sunix;
static puc_config_f puc_config_timedia;
static puc_config_f puc_config_titan;
@@ -986,12 +987,46 @@ const struct puc_cfg puc_pci_devices[] =
.config_function = puc_config_syba
},
- { 0x1fd4, 0x1999, 0x, 0,
- "Sunix SER5437A",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0002,
+ "Sunix SER5 2-port serial",
DEFAULT_RCLK * 8,
PUC_PORT_2S, 0x10, 0, 8,
},
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0004,
+ "Sunix SER5 4-port serial",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S, 0x10, 0, 8,
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0008,
+ "Sunix SER5 8-port serial",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0101,
+ "Sunix MIO5 1-port serial and 1284 Printer port",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_1S1P, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0102,
+ "Sunix MIO5 2-port serial and 1284 Printer port",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S1P, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0104,
+ "Sunix MIO5 4-port serial and 1284 Printer port",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S1P, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
{ 0x5372, 0x6873, 0x, 0,
"Sun 1040 PCI Quad Serial",
DEFAULT_RCLK,
@@ -1023,8 +1058,8 @@ const struct puc_cfg puc_pci_devices[] =
},
/*
-* This is more specific than the generic NM9835 entry that follows, and
-* is placed here to _prevent_ puc from claiming this single port card.
+* This is more specific than the generic NM9835 entry, and is placed
+* here to _prevent_ puc(4) from claiming this single port card.
*
* uart(4) will claim this device.
*/
@@ -1613,6 +1648,31 @@ puc_config_oxford_pcie(struct puc_softc
}
static int
+puc_config_sunix(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
+intptr_t *res)
+{
+ int error;
+
+ switch (cmd) {
+ case PUC_CFG_GET_OFS:
+ error = puc_config(sc, PUC_CFG_GET_TYPE, port, res);
+ if (error != 0)
+ return (error);
+ *res = (*res == PUC_TYPE_SERIAL) ? (port & 3) * 8 : 0;
+ return (0);
+ case PUC_CFG_GET_RID:
+ error = puc_config(sc, PUC_CFG_GET_TYPE, port, res);
+ if (error != 0)
+ return (error);
+ *res = (*res == PUC_TYPE_SERIAL && port <= 3) ? 0x10 : 0x14;
+ return (0);
+ default:
+ break;
+ }
+ return (ENXIO);
+}
+
+static int
puc_config_titan(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
intptr_t *res)
{
Modified: stable/10/sys/dev/uart/uart_bus_pci.c
==
--- stable/10/sys/dev/uart/uart_bus_pci.c Tue Apr 22 11:08:33 2014
(r264760)
+++ stable/10/sys/dev/uart/uart_bus_pci.c Tue Apr 22 13:02:03 2014
(r264761)
@@ -114,6 +114,8 @@ static const struct pci_id pci_ns8250_id
0x10, 16384000 },
{ 0x14e4, 0x4344, 0x, 0, "Sony Ericsson GC89 PC Card", 0x10},
{ 0x151f, 0x, 0x, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 },
+{ 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5 Serial Port", 0x10,
+ 8 * DEFAULT_RCLK },
{ 0x8086, 0x1c3d, 0x, 0, "Intel AMT - KT Controller", 0x10 },
{ 0x8086, 0x1d3d, 0x, 0, "Intel C600/X79 Serie
svn commit: r264762 - in stable/9/sys/dev: puc uart
Author: marius
Date: Tue Apr 22 13:02:06 2014
New Revision: 264762
URL: http://svnweb.freebsd.org/changeset/base/264762
Log:
MFC: r264257, r264327, r264514
Distinguish between the different variants and configurations of Sunix
{MIO,SER}5 chips instead of treating all of them as PUC_PORT_2S.
Among others, this fixes the hang seen when trying to probe the none-
existent second UART on an actually 1-port chip.
Obtained from:NetBSD (BAR layouts)
Sponsored by: Bally Wulff Games & Entertainment GmbH
Modified:
stable/9/sys/dev/puc/pucdata.c
stable/9/sys/dev/uart/uart_bus_pci.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/puc/ (props changed)
Modified: stable/9/sys/dev/puc/pucdata.c
==
--- stable/9/sys/dev/puc/pucdata.c Tue Apr 22 13:02:03 2014
(r264761)
+++ stable/9/sys/dev/puc/pucdata.c Tue Apr 22 13:02:06 2014
(r264762)
@@ -58,6 +58,7 @@ static puc_config_f puc_config_oxford_pc
static puc_config_f puc_config_quatech;
static puc_config_f puc_config_syba;
static puc_config_f puc_config_siig;
+static puc_config_f puc_config_sunix;
static puc_config_f puc_config_timedia;
static puc_config_f puc_config_titan;
@@ -986,12 +987,46 @@ const struct puc_cfg puc_pci_devices[] =
.config_function = puc_config_syba
},
- { 0x1fd4, 0x1999, 0x, 0,
- "Sunix SER5437A",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0002,
+ "Sunix SER5 2-port serial",
DEFAULT_RCLK * 8,
PUC_PORT_2S, 0x10, 0, 8,
},
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0004,
+ "Sunix SER5 4-port serial",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S, 0x10, 0, 8,
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0008,
+ "Sunix SER5 8-port serial",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_8S, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0101,
+ "Sunix MIO5 1-port serial and 1284 Printer port",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_1S1P, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0102,
+ "Sunix MIO5 2-port serial and 1284 Printer port",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_2S1P, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0104,
+ "Sunix MIO5 4-port serial and 1284 Printer port",
+ DEFAULT_RCLK * 8,
+ PUC_PORT_4S1P, -1, -1, -1,
+ .config_function = puc_config_sunix
+ },
+
{ 0x5372, 0x6873, 0x, 0,
"Sun 1040 PCI Quad Serial",
DEFAULT_RCLK,
@@ -1023,8 +1058,8 @@ const struct puc_cfg puc_pci_devices[] =
},
/*
-* This is more specific than the generic NM9835 entry that follows, and
-* is placed here to _prevent_ puc from claiming this single port card.
+* This is more specific than the generic NM9835 entry, and is placed
+* here to _prevent_ puc(4) from claiming this single port card.
*
* uart(4) will claim this device.
*/
@@ -1613,6 +1648,31 @@ puc_config_oxford_pcie(struct puc_softc
}
static int
+puc_config_sunix(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
+intptr_t *res)
+{
+ int error;
+
+ switch (cmd) {
+ case PUC_CFG_GET_OFS:
+ error = puc_config(sc, PUC_CFG_GET_TYPE, port, res);
+ if (error != 0)
+ return (error);
+ *res = (*res == PUC_TYPE_SERIAL) ? (port & 3) * 8 : 0;
+ return (0);
+ case PUC_CFG_GET_RID:
+ error = puc_config(sc, PUC_CFG_GET_TYPE, port, res);
+ if (error != 0)
+ return (error);
+ *res = (*res == PUC_TYPE_SERIAL && port <= 3) ? 0x10 : 0x14;
+ return (0);
+ default:
+ break;
+ }
+ return (ENXIO);
+}
+
+static int
puc_config_titan(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
intptr_t *res)
{
Modified: stable/9/sys/dev/uart/uart_bus_pci.c
==
--- stable/9/sys/dev/uart/uart_bus_pci.cTue Apr 22 13:02:03 2014
(r264761)
+++ stable/9/sys/dev/uart/uart_bus_pci.cTue Apr 22 13:02:06 2014
(r264762)
@@ -113,6 +113,8 @@ static const struct pci_id pci_ns8250_id
0x10, 16384000 },
{ 0x14e4, 0x4344, 0x, 0, "Sony Ericsson GC89 PC Card", 0x10},
{ 0x151f, 0x, 0x, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 },
+{ 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5 Serial Port", 0x10,
+ 8 * DEFAULT_RCLK },
{ 0x8086, 0x1c3d, 0x, 0, "Intel AM
svn commit: r264763 - in stable/8/sys/dev: puc uart
Author: marius
Date: Tue Apr 22 13:02:12 2014
New Revision: 264763
URL: http://svnweb.freebsd.org/changeset/base/264763
Log:
MFC: r229379
Add support for Intel EG20T serial ports
MFC: r248340
Add support for Exar XR17V358 8-port serial device to puc(4)
MFC: r248472
Correct the definition for Exar XR17V258IV: we must use a config_function
to specify the offset into the PCI memory spare at which each serial port
will find its registers. This was already done for other Exar PCI serial
devices; it was accidentally omitted for this specific device.
MFC: r251713
Fix whitespace and normalize some entries.
MFC: r251715
All of Oxford/PLX OX16PCI954, OXm16PCI954 and OXu16PCI954 share the
exact same (subsystem) device and vendor IDs. However, the reference
design for the OXu16PCI954 uses a 14.7456 MHz clock (as does the EXSYS
EX-41098-2 equipped with these), while at least the OX16PCI954 defaults
to a 1.8432 MHz one. According to the datasheets of these chips, the
only difference in PCI configuration space is that OXu16PCI954 have
a revision ID of 1 while the other two are at 0. So employ the latter
for determining the default clock rates of this family.
MFC: r264257, r264327, r264514
Distinguish between the different variants and configurations of Sunix
{MIO,SER}5 chips instead of treating all of them as PUC_PORT_2S.
Among others, this fixes the hang seen when trying to probe the none-
existent second UART on an actually 1-port chip.
Obtained from:NetBSD (BAR layouts)
Sponsored by: Bally Wulff Games & Entertainment GmbH
Modified:
stable/8/sys/dev/puc/pucdata.c
stable/8/sys/dev/uart/uart_bus_pci.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/puc/ (props changed)
stable/8/sys/dev/uart/ (props changed)
Modified: stable/8/sys/dev/puc/pucdata.c
==
--- stable/8/sys/dev/puc/pucdata.c Tue Apr 22 13:02:06 2014
(r264762)
+++ stable/8/sys/dev/puc/pucdata.c Tue Apr 22 13:02:12 2014
(r264763)
@@ -50,12 +50,15 @@ __FBSDID("$FreeBSD$");
static puc_config_f puc_config_amc;
static puc_config_f puc_config_diva;
static puc_config_f puc_config_exar;
+static puc_config_f puc_config_exar_pcie;
static puc_config_f puc_config_icbook;
static puc_config_f puc_config_moxa;
+static puc_config_f puc_config_oxford_pci954;
static puc_config_f puc_config_oxford_pcie;
static puc_config_f puc_config_quatech;
static puc_config_f puc_config_syba;
static puc_config_f puc_config_siig;
+static puc_config_f puc_config_sunix;
static puc_config_f puc_config_timedia;
static puc_config_f puc_config_titan;
@@ -511,14 +514,14 @@ const struct puc_cfg puc_pci_devices[] =
"Moxa Technologies, Smartio CP-102E/PCIe",
DEFAULT_RCLK * 8,
PUC_PORT_2S, 0x14, 0, -1,
- .config_function = puc_config_moxa
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1025, 0x, 0,
"Moxa Technologies, Smartio CP-102EL/PCIe",
DEFAULT_RCLK * 8,
PUC_PORT_2S, 0x14, 0, -1,
- .config_function = puc_config_moxa
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1040, 0x, 0,
@@ -549,7 +552,7 @@ const struct puc_cfg puc_pci_devices[] =
"Moxa Technologies, Smartio CP-104EL-A/PCIe",
DEFAULT_RCLK * 8,
PUC_PORT_4S, 0x14, 0, -1,
- .config_function = puc_config_moxa
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1120, 0x, 0,
@@ -568,14 +571,14 @@ const struct puc_cfg puc_pci_devices[] =
"Moxa Technologies, Smartio CP-114EL/PCIe",
DEFAULT_RCLK * 8,
PUC_PORT_4S, 0x14, 0, -1,
- .config_function = puc_config_moxa
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1182, 0x, 0,
"Moxa Technologies, Smartio CP-118EL-A/PCIe",
DEFAULT_RCLK * 8,
PUC_PORT_8S, 0x14, 0, -1,
- .config_function = puc_config_moxa
+ .config_function = puc_config_moxa
},
{ 0x1393, 0x1680, 0x, 0,
@@ -600,7 +603,7 @@ const struct puc_cfg puc_pci_devices[] =
"Moxa Technologies, Smartio CP-168EL-A/PCIe",
DEFAULT_RCLK * 8,
PUC_PORT_8S, 0x14, 0, -1,
- .config_function = puc_config_moxa
+ .config_function = puc_config_moxa
},
{ 0x13a8, 0x0152, 0x, 0,
@@ -628,6 +631,15 @@ const struct puc_cfg puc_pci_devices[] =
"Exar XR17V258IV",
DEFAULT_RCLK * 8,
PUC_PORT_8S, 0x10, 0, -1,
+ .config_function = puc_config_exar
+ },
+
+ /* The XR17V358 uses the 125MHz PCIe clock as its reference clock. */
+
svn commit: r264764 - stable/8/sys/dev/usb/controller
Author: marius
Date: Tue Apr 22 13:58:39 2014
New Revision: 264764
URL: http://svnweb.freebsd.org/changeset/base/264764
Log:
MFC: r249336
Add ID for ASMedia ASM1042 USB 3.0 controller.
MFC: r253094
Use MSI for xhci(4), if supported.
MFC: r253398
Add a tunable to force disable MSI use for xhci(4).
Modified:
stable/8/sys/dev/usb/controller/xhci.h
stable/8/sys/dev/usb/controller/xhci_pci.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/usb/ (props changed)
Modified: stable/8/sys/dev/usb/controller/xhci.h
==
--- stable/8/sys/dev/usb/controller/xhci.h Tue Apr 22 13:02:12 2014
(r264763)
+++ stable/8/sys/dev/usb/controller/xhci.h Tue Apr 22 13:58:39 2014
(r264764)
@@ -441,6 +441,7 @@ struct xhci_softc {
struct usb_device *sc_devices[XHCI_MAX_DEVICES];
struct resource *sc_io_res;
+ int sc_irq_rid;
struct resource *sc_irq_res;
void*sc_intr_hdl;
Modified: stable/8/sys/dev/usb/controller/xhci_pci.c
==
--- stable/8/sys/dev/usb/controller/xhci_pci.c Tue Apr 22 13:02:12 2014
(r264763)
+++ stable/8/sys/dev/usb/controller/xhci_pci.c Tue Apr 22 13:58:39 2014
(r264764)
@@ -99,6 +99,9 @@ xhci_pci_match(device_t self)
case 0x01941033:
return ("NEC uPD720200 USB 3.0 controller");
+ case 0x10421b21:
+ return ("ASMedia ASM1042 USB 3.0 controller");
+
case 0x9c318086:
case 0x1e318086:
return ("Intel Panther Point USB 3.0 controller");
@@ -130,6 +133,9 @@ xhci_pci_probe(device_t self)
}
}
+static int xhci_use_msi = 1;
+TUNABLE_INT("hw.usb.xhci.msi", &xhci_use_msi);
+
static int
xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear)
{
@@ -153,8 +159,7 @@ static int
xhci_pci_attach(device_t self)
{
struct xhci_softc *sc = device_get_softc(self);
- int err;
- int rid;
+ int count, err, rid;
/* XXX check for 64-bit capability */
@@ -176,9 +181,20 @@ xhci_pci_attach(device_t self)
sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
sc->sc_io_size = rman_get_size(sc->sc_io_res);
- rid = 0;
- sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid,
- RF_SHAREABLE | RF_ACTIVE);
+ sc->sc_irq_rid = 0;
+ if (xhci_use_msi) {
+ count = pci_msi_count(self);
+ if (count >= 1) {
+ count = 1;
+ if (pci_alloc_msi(self, &count) == 0) {
+ if (bootverbose)
+ device_printf(self, "MSI enabled\n");
+ sc->sc_irq_rid = 1;
+ }
+ }
+ }
+ sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ,
+ &sc->sc_irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (sc->sc_irq_res == NULL) {
device_printf(self, "Could not allocate IRQ\n");
goto error;
@@ -260,7 +276,10 @@ xhci_pci_detach(device_t self)
sc->sc_intr_hdl = NULL;
}
if (sc->sc_irq_res) {
- bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res);
+ if (sc->sc_irq_rid == 1)
+ pci_release_msi(self);
+ bus_release_resource(self, SYS_RES_IRQ, sc->sc_irq_rid,
+ sc->sc_irq_res);
sc->sc_irq_res = NULL;
}
if (sc->sc_io_res) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264765 - head/usr.sbin/mfiutil
Author: jhb
Date: Tue Apr 22 15:15:54 2014
New Revision: 264765
URL: http://svnweb.freebsd.org/changeset/base/264765
Log:
Don't claim the adapter is idle if it is clearing a drive.
MFC after:1 week
Modified:
head/usr.sbin/mfiutil/mfi_show.c
Modified: head/usr.sbin/mfiutil/mfi_show.c
==
--- head/usr.sbin/mfiutil/mfi_show.cTue Apr 22 13:58:39 2014
(r264764)
+++ head/usr.sbin/mfiutil/mfi_show.cTue Apr 22 15:15:54 2014
(r264765)
@@ -766,7 +766,7 @@ show_progress(int ac, char **av __unused
printf("drive %s ", mfi_drive_name(NULL, device_id,
MFI_DNAME_DEVICE_ID|MFI_DNAME_HONOR_OPTS));
mfi_display_progress("Clear", &pinfo.prog_info.clear);
-
+ busy = 1;
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264766 - head/usr.sbin/mfiutil
Author: jhb
Date: Tue Apr 22 15:17:32 2014
New Revision: 264766
URL: http://svnweb.freebsd.org/changeset/base/264766
Log:
- Fix an off by one error when checking for the stop event. This resulted
in not showing the most recent event by default.
- When the stop even is hit, break out of the outer loop to stop fetching
more events.
MFC after:1 week
Modified:
head/usr.sbin/mfiutil/mfi_evt.c
Modified: head/usr.sbin/mfiutil/mfi_evt.c
==
--- head/usr.sbin/mfiutil/mfi_evt.c Tue Apr 22 15:15:54 2014
(r264765)
+++ head/usr.sbin/mfiutil/mfi_evt.c Tue Apr 22 15:17:32 2014
(r264766)
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -534,6 +535,7 @@ show_events(int ac, char **av)
struct mfi_evt_log_state info;
struct mfi_evt_list *list;
union mfi_evt filter;
+ bool first;
long val;
char *cp;
ssize_t size;
@@ -640,7 +642,9 @@ show_events(int ac, char **av)
close(fd);
return (ENOMEM);
}
- for (seq = start;;) {
+ first = true;
+ seq = start;
+ for (;;) {
if (mfi_get_events(fd, list, num_events, filter, seq,
&status) < 0) {
error = errno;
@@ -650,8 +654,6 @@ show_events(int ac, char **av)
return (error);
}
if (status == MFI_STAT_NOT_FOUND) {
- if (seq == start)
- warnx("No matching events found");
break;
}
if (status != MFI_STAT_OK) {
@@ -669,13 +671,14 @@ show_events(int ac, char **av)
* the case that our stop point is earlier in
* the buffer than our start point.
*/
- if (list->event[i].seq >= stop) {
+ if (list->event[i].seq > stop) {
if (start <= stop)
- break;
+ goto finish;
else if (list->event[i].seq < start)
- break;
+ goto finish;
}
mfi_decode_evt(fd, &list->event[i], verbose);
+ first = false;
}
/*
@@ -686,6 +689,9 @@ show_events(int ac, char **av)
seq = list->event[list->count - 1].seq + 1;
}
+finish:
+ if (first)
+ warnx("No matching events found");
free(list);
close(fd);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264767 - stable/8/sys/conf
Author: marius
Date: Tue Apr 22 16:04:31 2014
New Revision: 264767
URL: http://svnweb.freebsd.org/changeset/base/264767
Log:
MFC: r216746
Make it possible to specify WITHOUT_MODULES in a kernel config file.
Modified:
stable/8/sys/conf/kern.pre.mk
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/conf/ (props changed)
Modified: stable/8/sys/conf/kern.pre.mk
==
--- stable/8/sys/conf/kern.pre.mk Tue Apr 22 15:17:32 2014
(r264766)
+++ stable/8/sys/conf/kern.pre.mk Tue Apr 22 16:04:31 2014
(r264767)
@@ -167,6 +167,9 @@ MKMODULESENV+= ALL_MODULES=LINT
.if defined(MODULES_OVERRIDE)
MKMODULESENV+= MODULES_OVERRIDE="${MODULES_OVERRIDE}"
.endif
+.if defined(WITHOUT_MODULES)
+MKMODULESENV+= WITHOUT_MODULES="${WITHOUT_MODULES}"
+.endif
.if defined(DEBUG)
MKMODULESENV+= DEBUG_FLAGS="${DEBUG}"
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264768 - in head: sys/amd64/vmm usr.sbin/bhyve
Author: tychon
Date: Tue Apr 22 16:13:56 2014
New Revision: 264768
URL: http://svnweb.freebsd.org/changeset/base/264768
Log:
Factor out common ioport handler code for better hygiene -- pointed
out by neel@.
Approved by: neel (co-mentor)
Modified:
head/sys/amd64/vmm/vmm_ioport.c
head/usr.sbin/bhyve/inout.c
Modified: head/sys/amd64/vmm/vmm_ioport.c
==
--- head/sys/amd64/vmm/vmm_ioport.c Tue Apr 22 16:04:31 2014
(r264767)
+++ head/sys/amd64/vmm/vmm_ioport.c Tue Apr 22 16:13:56 2014
(r264768)
@@ -69,18 +69,19 @@ emulate_ioport(struct vm *vm, int vcpuid
if (handler == NULL)
return (-1);
+ switch (vmexit->u.inout.bytes) {
+ case 1:
+ mask = 0xff;
+ break;
+ case 2:
+ mask = 0x;
+ break;
+ default:
+ mask = 0x;
+ break;
+ }
+
if (!vmexit->u.inout.in) {
- switch (vmexit->u.inout.bytes) {
- case 1:
- mask = 0xff;
- break;
- case 2:
- mask = 0x;
- break;
- default:
- mask = 0x;
- break;
- }
val = vmexit->u.inout.eax & mask;
}
@@ -88,17 +89,6 @@ emulate_ioport(struct vm *vm, int vcpuid
vmexit->u.inout.port, vmexit->u.inout.bytes, &val);
if (!error && vmexit->u.inout.in) {
- switch (vmexit->u.inout.bytes) {
- case 1:
- mask = 0xff;
- break;
- case 2:
- mask = 0x;
- break;
- default:
- mask = 0x;
- break;
- }
vmexit->u.inout.eax &= ~mask;
vmexit->u.inout.eax |= val & mask;
}
Modified: head/usr.sbin/bhyve/inout.c
==
--- head/usr.sbin/bhyve/inout.c Tue Apr 22 16:04:31 2014(r264767)
+++ head/usr.sbin/bhyve/inout.c Tue Apr 22 16:13:56 2014(r264768)
@@ -107,18 +107,19 @@ emulate_inout(struct vmctx *ctx, int vcp
if (strict && handler == default_inout)
return (-1);
+ switch (bytes) {
+ case 1:
+ mask = 0xff;
+ break;
+ case 2:
+ mask = 0x;
+ break;
+ default:
+ mask = 0x;
+ break;
+ }
+
if (!in) {
- switch (bytes) {
- case 1:
- mask = 0xff;
- break;
- case 2:
- mask = 0x;
- break;
- default:
- mask = 0x;
- break;
- }
val = *eax & mask;
}
@@ -131,17 +132,6 @@ emulate_inout(struct vmctx *ctx, int vcp
error = -1;
if (!error && in) {
- switch (bytes) {
- case 1:
- mask = 0xff;
- break;
- case 2:
- mask = 0x;
- break;
- default:
- mask = 0x;
- break;
- }
*eax &= ~mask;
*eax |= val & mask;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264769 - head/sys/geom/uncompress
Author: loos
Date: Tue Apr 22 18:08:34 2014
New Revision: 264769
URL: http://svnweb.freebsd.org/changeset/base/264769
Log:
Keep geom_uncompress(4) in line with geom_uzip(4), bring in the r264504 fix.
Make sure not to start I/O bigger than MAXPHYS bytes.
Quoting r264504:
When we detect the condition, we'll reduce the block count and perform
a "short" read. In g_uncompress_done() we need to consider the original
I/O length and stop early if we're about to deflate a block that we didn't
read. By using bio_completed in the cloned BIO and not bio_length to
check for this, we automatically and gracefully handle short reads that
our providers may be doing on top of the short reads we may initiate
ourselves.
Reviewed by: marcel
Modified:
head/sys/geom/uncompress/g_uncompress.c
Modified: head/sys/geom/uncompress/g_uncompress.c
==
--- head/sys/geom/uncompress/g_uncompress.c Tue Apr 22 16:13:56 2014
(r264768)
+++ head/sys/geom/uncompress/g_uncompress.c Tue Apr 22 18:08:34 2014
(r264769)
@@ -169,7 +169,7 @@ g_uncompress_done(struct bio *bp)
struct g_geom *gp;
struct bio *bp2;
uint32_t start_blk, i;
- off_t pos, upos;
+ off_t iolen, pos, upos;
size_t bsize;
int err;
@@ -210,6 +210,7 @@ g_uncompress_done(struct bio *bp)
*/
start_blk = bp2->bio_offset / sc->blksz;
bsize = pp2->sectorsize;
+ iolen = bp->bio_completed;
pos = sc->offsets[start_blk] % bsize;
upos = 0;
@@ -239,6 +240,13 @@ g_uncompress_done(struct bio *bp)
continue;
}
+ if (len > iolen) {
+ DPRINTF(("%s: done: early termination: len (%jd) > "
+ "iolen (%jd)\n",
+ gp->name, (intmax_t)len, (intmax_t)iolen));
+ break;
+ }
+
mtx_lock(&sc->last_mtx);
#ifdef GEOM_UNCOMPRESS_DEBUG
@@ -292,6 +300,7 @@ g_uncompress_done(struct bio *bp)
mtx_unlock(&sc->last_mtx);
pos += len;
+ iolen -= len;
upos += ulen;
bp2->bio_completed += ulen;
}
@@ -380,10 +389,18 @@ g_uncompress_start(struct bio *bp)
bsize = pp2->sectorsize;
bp2->bio_done = g_uncompress_done;
- bp2->bio_offset = rounddown(sc->offsets[start_blk],bsize);
- bp2->bio_length = roundup(sc->offsets[end_blk],bsize) -
- bp2->bio_offset;
- bp2->bio_data = malloc(bp2->bio_length, M_GEOM_UNCOMPRESS, M_NOWAIT);
+ bp2->bio_offset = rounddown(sc->offsets[start_blk], bsize);
+ while (1) {
+ bp2->bio_length = roundup(sc->offsets[end_blk], bsize) -
+ bp2->bio_offset;
+ if (bp2->bio_length < MAXPHYS)
+ break;
+
+ end_blk--;
+ DPRINTF((
+ "%s: bio_length (%jd) > MAXPHYS: lowering end_blk to %u\n",
+ gp->name, (intmax_t)bp2->bio_length, end_blk));
+ }
DPRINTF(("%s: start %jd + %jd -> %ju + %ju -> %jd + %jd\n",
gp->name,
@@ -392,6 +409,7 @@ g_uncompress_start(struct bio *bp)
(uintmax_t)sc->offsets[end_blk] - sc->offsets[start_blk],
(intmax_t)bp2->bio_offset, (intmax_t)bp2->bio_length));
+ bp2->bio_data = malloc(bp2->bio_length, M_GEOM_UNCOMPRESS, M_NOWAIT);
if (bp2->bio_data == NULL) {
g_destroy_bio(bp2);
g_io_deliver(bp, ENOMEM);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264770 - head/usr.sbin/bhyve
Author: delphij
Date: Tue Apr 22 18:55:21 2014
New Revision: 264770
URL: http://svnweb.freebsd.org/changeset/base/264770
Log:
Use calloc() in favor of malloc + memset.
Reviewed by: neel
Modified:
head/usr.sbin/bhyve/block_if.c
head/usr.sbin/bhyve/mevent.c
head/usr.sbin/bhyve/pci_ahci.c
head/usr.sbin/bhyve/pci_emul.c
head/usr.sbin/bhyve/pci_passthru.c
head/usr.sbin/bhyve/pci_virtio_block.c
head/usr.sbin/bhyve/pci_virtio_net.c
head/usr.sbin/bhyve/pci_virtio_rnd.c
head/usr.sbin/bhyve/uart_emul.c
Modified: head/usr.sbin/bhyve/block_if.c
==
--- head/usr.sbin/bhyve/block_if.c Tue Apr 22 18:08:34 2014
(r264769)
+++ head/usr.sbin/bhyve/block_if.c Tue Apr 22 18:55:21 2014
(r264770)
@@ -270,13 +270,12 @@ blockif_open(const char *optstr, const c
assert(sectsz != 0);
}
- bc = malloc(sizeof(struct blockif_ctxt));
+ bc = calloc(1, sizeof(struct blockif_ctxt));
if (bc == NULL) {
close(fd);
return (NULL);
}
- memset(bc, 0, sizeof(*bc));
bc->bc_magic = BLOCKIF_SIG;
bc->bc_fd = fd;
bc->bc_size = size;
Modified: head/usr.sbin/bhyve/mevent.c
==
--- head/usr.sbin/bhyve/mevent.cTue Apr 22 18:08:34 2014
(r264769)
+++ head/usr.sbin/bhyve/mevent.cTue Apr 22 18:55:21 2014
(r264770)
@@ -268,12 +268,11 @@ mevent_add(int tfd, enum ev_type type,
/*
* Allocate an entry, populate it, and add it to the change list.
*/
- mevp = malloc(sizeof(struct mevent));
+ mevp = calloc(1, sizeof(struct mevent));
if (mevp == NULL) {
goto exit;
}
- memset(mevp, 0, sizeof(struct mevent));
if (type == EVF_TIMER) {
mevp->me_msecs = tfd;
mevp->me_timid = mevent_timid++;
Modified: head/usr.sbin/bhyve/pci_ahci.c
==
--- head/usr.sbin/bhyve/pci_ahci.c Tue Apr 22 18:08:34 2014
(r264769)
+++ head/usr.sbin/bhyve/pci_ahci.c Tue Apr 22 18:55:21 2014
(r264770)
@@ -1756,8 +1756,7 @@ pci_ahci_init(struct vmctx *ctx, struct
dbg = fopen("/tmp/log", "w+");
#endif
- sc = malloc(sizeof(struct pci_ahci_softc));
- memset(sc, 0, sizeof(struct pci_ahci_softc));
+ sc = calloc(1, sizeof(struct pci_ahci_softc));
pi->pi_arg = sc;
sc->asc_pi = pi;
sc->ports = MAX_PORTS;
Modified: head/usr.sbin/bhyve/pci_emul.c
==
--- head/usr.sbin/bhyve/pci_emul.c Tue Apr 22 18:08:34 2014
(r264769)
+++ head/usr.sbin/bhyve/pci_emul.c Tue Apr 22 18:55:21 2014
(r264770)
@@ -688,8 +688,7 @@ pci_emul_init(struct vmctx *ctx, struct
struct pci_devinst *pdi;
int err;
- pdi = malloc(sizeof(struct pci_devinst));
- bzero(pdi, sizeof(*pdi));
+ pdi = calloc(1, sizeof(struct pci_devinst));
pdi->pi_vmctx = ctx;
pdi->pi_bus = bus;
@@ -781,8 +780,7 @@ pci_msix_table_init(struct pci_devinst *
assert(table_entries <= MAX_MSIX_TABLE_ENTRIES);
table_size = table_entries * MSIX_TABLE_ENTRY_SIZE;
- pi->pi_msix.table = malloc(table_size);
- bzero(pi->pi_msix.table, table_size);
+ pi->pi_msix.table = calloc(1, table_size);
/* set mask bit of vector control register */
for (i = 0; i < table_entries; i++)
@@ -1781,8 +1779,7 @@ pci_emul_dinit(struct vmctx *ctx, struct
int error;
struct pci_emul_dsoftc *sc;
- sc = malloc(sizeof(struct pci_emul_dsoftc));
- memset(sc, 0, sizeof(struct pci_emul_dsoftc));
+ sc = calloc(1, sizeof(struct pci_emul_dsoftc));
pi->pi_arg = sc;
Modified: head/usr.sbin/bhyve/pci_passthru.c
==
--- head/usr.sbin/bhyve/pci_passthru.c Tue Apr 22 18:08:34 2014
(r264769)
+++ head/usr.sbin/bhyve/pci_passthru.c Tue Apr 22 18:55:21 2014
(r264770)
@@ -232,8 +232,7 @@ cfginitmsi(struct passthru_softc *sc)
/* Allocate the emulated MSI-X table array */
table_size = pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE;
- pi->pi_msix.table = malloc(table_size);
- bzero(pi->pi_msix.table, table_size);
+ pi->pi_msix.table = calloc(1, table_size);
/* Mask all table entries */
for (i = 0; i < pi->pi_msix.table_count; i++) {
@@ -574,8 +573,7 @@ passthru_init(struct vmctx *ctx, struct
if (vm_assign_pptdev(ctx, bus, slot, func) != 0)
goto done;
- sc = malloc(sizeof(struct passthru_softc));
- memset(sc, 0, size
svn commit: r264772 - head/sys/dev/sfxge
Author: gnn
Date: Tue Apr 22 20:19:09 2014
New Revision: 264772
URL: http://svnweb.freebsd.org/changeset/base/264772
Log:
Check that port is started when MAC filter is set
The MAC filter set may be called without softc_lock held in the case of
SIOCADDMULTI and SIOCDELMULTI ioctls. The ioctl handler checks IFF_DRV_RUNNING
flag which implies port started, but it is not guaranteed to remain.
softc_lock shared lock can't be held in the case of these ioctls processing,
since it results in failure where kernel complains that non-sleepable
lock is held in sleeping thread.
Both problems are repeatable on LAG with LACP proto bring up.
Submitted by: Andrew Rybchenko
Sponsored by: Solarflare Communications, Inc.
MFC after:2 weeks
Modified:
head/sys/dev/sfxge/sfxge_port.c
Modified: head/sys/dev/sfxge/sfxge_port.c
==
--- head/sys/dev/sfxge/sfxge_port.c Tue Apr 22 20:17:05 2014
(r264771)
+++ head/sys/dev/sfxge/sfxge_port.c Tue Apr 22 20:19:09 2014
(r264772)
@@ -320,10 +320,21 @@ sfxge_mac_filter_set(struct sfxge_softc
struct sfxge_port *port = &sc->port;
int rc;
- KASSERT(port->init_state == SFXGE_PORT_STARTED, ("port not started"));
-
mtx_lock(&port->lock);
- rc = sfxge_mac_filter_set_locked(sc);
+ /*
+* The function may be called without softc_lock held in the
+* case of SIOCADDMULTI and SIOCDELMULTI ioctls. ioctl handler
+* checks IFF_DRV_RUNNING flag which implies port started, but
+* it is not guaranteed to remain. softc_lock shared lock can't
+* be held in the case of these ioctls processing, since it
+* results in failure where kernel complains that non-sleepable
+* lock is held in sleeping thread. Both problems are repeatable
+* on LAG with LACP proto bring up.
+*/
+ if (port->init_state == SFXGE_PORT_STARTED)
+ rc = sfxge_mac_filter_set_locked(sc);
+ else
+ rc = 0;
mtx_unlock(&port->lock);
return rc;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264774 - in head/kerberos5/lib: libasn1 libgssapi_spnego libhdb libhx509
Author: emaste
Date: Tue Apr 22 20:37:07 2014
New Revision: 264774
URL: http://svnweb.freebsd.org/changeset/base/264774
Log:
Fix installworld failure when kerberos source files have new timestamps
If a kerberos .hx source file is newer than the .h copy, but the content
is the same, then during buildworld the "cmp -s || cp" command in the
.hx.h rule would do nothing, leaving the .h copy with the older
timestamp. During installworld the rule would again be invoked, causing
a failure as neither cmp or cp would exist in the temporary path.
As the underlying issue should be resolved by r262209, unconditionally
copy the file.
No objection: peter@
Tested by:gjb@
Sponsored by: The FreeBSD Foundation
Modified:
head/kerberos5/lib/libasn1/Makefile
head/kerberos5/lib/libgssapi_spnego/Makefile
head/kerberos5/lib/libhdb/Makefile
head/kerberos5/lib/libhx509/Makefile
Modified: head/kerberos5/lib/libasn1/Makefile
==
--- head/kerberos5/lib/libasn1/Makefile Tue Apr 22 20:21:40 2014
(r264773)
+++ head/kerberos5/lib/libasn1/Makefile Tue Apr 22 20:37:07 2014
(r264774)
@@ -112,10 +112,10 @@ ${GEN_KX509}: kx509.asn1
.SUFFIXES: .h .c .x .hx
.x.c:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.hx.h:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.include
Modified: head/kerberos5/lib/libgssapi_spnego/Makefile
==
--- head/kerberos5/lib/libgssapi_spnego/MakefileTue Apr 22 20:21:40
2014(r264773)
+++ head/kerberos5/lib/libgssapi_spnego/MakefileTue Apr 22 20:37:07
2014(r264774)
@@ -46,10 +46,10 @@ ${GEN}: spnego.asn1 spnego.opt
.SUFFIXES: .h .c .x .hx
.x.c:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.hx.h:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.include
Modified: head/kerberos5/lib/libhdb/Makefile
==
--- head/kerberos5/lib/libhdb/Makefile Tue Apr 22 20:21:40 2014
(r264773)
+++ head/kerberos5/lib/libhdb/Makefile Tue Apr 22 20:37:07 2014
(r264774)
@@ -91,10 +91,10 @@ ${GEN}: hdb.asn1
.SUFFIXES: .h .c .x .hx
.x.c:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.hx.h:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.include
Modified: head/kerberos5/lib/libhx509/Makefile
==
--- head/kerberos5/lib/libhx509/MakefileTue Apr 22 20:21:40 2014
(r264773)
+++ head/kerberos5/lib/libhx509/MakefileTue Apr 22 20:37:07 2014
(r264774)
@@ -286,10 +286,10 @@ ${GEN_CRMF}: crmf.asn1
.SUFFIXES: .h .c .x .hx
.x.c:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.hx.h:
- cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+ cp ${.IMPSRC} ${.TARGET}
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264775 - stable/10/share/man/man4
Author: brueffer Date: Tue Apr 22 20:51:07 2014 New Revision: 264775 URL: http://svnweb.freebsd.org/changeset/base/264775 Log: MFC: r264384, r264415 mdoc and language improvements. Modified: stable/10/share/man/man4/timecounters.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/timecounters.4 == --- stable/10/share/man/man4/timecounters.4 Tue Apr 22 20:37:07 2014 (r264774) +++ stable/10/share/man/man4/timecounters.4 Tue Apr 22 20:51:07 2014 (r264775) @@ -24,27 +24,27 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2011 +.Dd April 12, 2014 .Dt TIMECOUNTERS 4 .Os .Sh NAME .Nm timecounters .Nd kernel time counters subsystem .Sh SYNOPSIS -Kernel uses several types of time-related devices, such as: real time clocks, +The kernel uses several types of time-related devices, such as: real time clocks, time counters and event timers. -Real time clocks responsible for tracking real world time, mostly when system +Real time clocks are responsible for tracking real world time, mostly when the system is down. -Time counters are responsible for tracking purposes, when system is running. -Event timers are responsible for generating interrupts at specified time or +Time counters are responsible for tracking purposes, when the system is running. +Event timers are responsible for generating interrupts at a specified time or periodically, to run different time-based events. This page is about the second. .Sh DESCRIPTION -Time counters are the lowest level of time tracking in kernel. +Time counters are the lowest level of time tracking in the kernel. They provide monotonically increasing timestamps with known width and update frequency. -They can overflow, drift, etc and so in raw form used only in very limited -performance-critical places like process scheduler. +They can overflow, drift, etc and so in raw form can be used only in very limited +performance-critical places like the process scheduler. .Pp More usable time is created by scaling the values read from the selected time counter and combining it with some offset, regularly updated by @@ -54,13 +54,14 @@ on invocation. .Pp Different platforms provide different kinds of timer hardware. -The goal of the time counters subsystem is to provide unified way to access +The goal of the time counters subsystem is to provide a unified way to access that hardware. .Pp -Each driver implementing time counters, registers them at the subsystem. -It is possible to see the list of present time counters, like this, via +Each driver implementing time counters registers them with the subsystem. +It is possible to see the list of present time counters, via the .Va kern.timecounter -sysctl: +.Xr sysctl 8 +variable: .Bd -literal kern.timecounter.choice: TSC-low(-100) HPET(950) i8254(0) ACPI-fast(900) dummy(-100) kern.timecounter.tc.ACPI-fast.mask: 16777215 @@ -81,7 +82,7 @@ kern.timecounter.tc.TSC-low.frequency: 1 kern.timecounter.tc.TSC-low.quality: -100 .Ed .Pp -where: +The output nodes are defined as follows: .Bl -inset .It Va kern.timecounter.tc. Ns Ar X Ns Va .mask is a bitmask, defining valid counter bits, @@ -90,13 +91,13 @@ is a present counter value, .It Va kern.timecounter.tc. Ns Ar X Ns Va .frequency is a counter update frequency, .It Va kern.timecounter.tc. Ns Ar X Ns Va .quality -is an integral value, defining how good is this time counter, -comparing to others. -Negative value means that this time counter is broken and should not be used. +is an integral value, defining the quality of this time counter +compared to others. +A negative value means this time counter is broken and should not be used. .El .Pp -Time management code of the kernel chooses one time counter from that list. -Current choice can be read and affected via +The time management code of the kernel chooses one time counter from that list. +The current choice can be read and affected via the .Va kern.timecounter.hardware tunable/sysctl. .Sh SEE ALSO ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264776 - stable/9/share/man/man4
Author: brueffer Date: Tue Apr 22 20:53:05 2014 New Revision: 264776 URL: http://svnweb.freebsd.org/changeset/base/264776 Log: MFC: r264384, r264415 mdoc and language improvements. Modified: stable/9/share/man/man4/timecounters.4 Directory Properties: stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/timecounters.4 == --- stable/9/share/man/man4/timecounters.4 Tue Apr 22 20:51:07 2014 (r264775) +++ stable/9/share/man/man4/timecounters.4 Tue Apr 22 20:53:05 2014 (r264776) @@ -24,27 +24,27 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2011 +.Dd April 12, 2014 .Dt TIMECOUNTERS 4 .Os .Sh NAME .Nm timecounters .Nd kernel time counters subsystem .Sh SYNOPSIS -Kernel uses several types of time-related devices, such as: real time clocks, +The kernel uses several types of time-related devices, such as: real time clocks, time counters and event timers. -Real time clocks responsible for tracking real world time, mostly when system +Real time clocks are responsible for tracking real world time, mostly when the system is down. -Time counters are responsible for tracking purposes, when system is running. -Event timers are responsible for generating interrupts at specified time or +Time counters are responsible for tracking purposes, when the system is running. +Event timers are responsible for generating interrupts at a specified time or periodically, to run different time-based events. This page is about the second. .Sh DESCRIPTION -Time counters are the lowest level of time tracking in kernel. +Time counters are the lowest level of time tracking in the kernel. They provide monotonically increasing timestamps with known width and update frequency. -They can overflow, drift, etc and so in raw form used only in very limited -performance-critical places like process scheduler. +They can overflow, drift, etc and so in raw form can be used only in very limited +performance-critical places like the process scheduler. .Pp More usable time is created by scaling the values read from the selected time counter and combining it with some offset, regularly updated by @@ -54,13 +54,14 @@ on invocation. .Pp Different platforms provide different kinds of timer hardware. -The goal of the time counters subsystem is to provide unified way to access +The goal of the time counters subsystem is to provide a unified way to access that hardware. .Pp -Each driver implementing time counters, registers them at the subsystem. -It is possible to see the list of present time counters, like this, via +Each driver implementing time counters registers them with the subsystem. +It is possible to see the list of present time counters, via the .Va kern.timecounter -sysctl: +.Xr sysctl 8 +variable: .Bd -literal kern.timecounter.choice: TSC-low(-100) HPET(950) i8254(0) ACPI-fast(900) dummy(-100) kern.timecounter.tc.ACPI-fast.mask: 16777215 @@ -81,7 +82,7 @@ kern.timecounter.tc.TSC-low.frequency: 1 kern.timecounter.tc.TSC-low.quality: -100 .Ed .Pp -where: +The output nodes are defined as follows: .Bl -inset .It Va kern.timecounter.tc. Ns Ar X Ns Va .mask is a bitmask, defining valid counter bits, @@ -90,13 +91,13 @@ is a present counter value, .It Va kern.timecounter.tc. Ns Ar X Ns Va .frequency is a counter update frequency, .It Va kern.timecounter.tc. Ns Ar X Ns Va .quality -is an integral value, defining how good is this time counter, -comparing to others. -Negative value means that this time counter is broken and should not be used. +is an integral value, defining the quality of this time counter +compared to others. +A negative value means this time counter is broken and should not be used. .El .Pp -Time management code of the kernel chooses one time counter from that list. -Current choice can be read and affected via +The time management code of the kernel chooses one time counter from that list. +The current choice can be read and affected via the .Va kern.timecounter.hardware tunable/sysctl. .Sh SEE ALSO ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264777 - stable/10/share/man/man4
Author: brueffer Date: Tue Apr 22 20:55:46 2014 New Revision: 264777 URL: http://svnweb.freebsd.org/changeset/base/264777 Log: MFC: r264386 Improve markup and remove contractions. Modified: stable/10/share/man/man4/usb_quirk.4 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man4/usb_quirk.4 == --- stable/10/share/man/man4/usb_quirk.4Tue Apr 22 20:53:05 2014 (r264776) +++ stable/10/share/man/man4/usb_quirk.4Tue Apr 22 20:55:46 2014 (r264777) @@ -49,13 +49,13 @@ swap left and right channels .It UQ_AU_INP_ASYNC input is async despite claim of adaptive .It UQ_AU_NO_FRAC -don't adjust for fractional samples +do not adjust for fractional samples .It UQ_AU_NO_XU audio device has broken extension unit .It UQ_BAD_ADC bad audio spec version number .It UQ_BAD_AUDIO -device claims audio class, but isn't +device claims audio class, but is not .It UQ_BROKEN_BIDIR printer has broken bidir mode .It UQ_BUS_POWERED @@ -69,7 +69,7 @@ device should set the boot protocol .It UQ_UMS_IGNORE device should be ignored by ums class .It UQ_MS_BAD_CLASS -doesn't identify properly +does not identify properly .It UQ_MS_LEADING_BYTE mouse sends an unknown leading byte .It UQ_MS_REVZ @@ -150,27 +150,28 @@ ejects after Huawei USB command ejects after Sierra USB command .It UQ_MSC_EJECT_SCSIEJECT ejects after SCSI eject command -0x1b000200 +.Dv 0x1b000200 .It UQ_MSC_EJECT_REZERO ejects after SCSI rezero command -0x0100 +.Dv 0x0100 .It UQ_MSC_EJECT_ZTESTOR ejects after ZTE SCSI command -0x85010101180101010101 +.Dv 0x85010101180101010101 .It UQ_MSC_EJECT_CMOTECH ejects after C-motech SCSI command -0xff52444556434847 +.Dv 0xff52444556434847 .It UQ_MSC_EJECT_WAIT wait for the device to eject .It UQ_MSC_EJECT_SAEL_M460 ejects after Sael USB commands .It UQ_MSC_EJECT_HUAWEISCSI ejects after Huawei SCSI command -0x1106 +.Dv 0x1106 .It UQ_MSC_EJECT_TCT ejects after TCT SCSI command -0x06f504025270 +.Dv 0x06f504025270 .El +.Pp See .Pa /sys/dev/usb/quirk/usb_quirk.h for the complete list of supported quirks. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264778 - stable/9/share/man/man4
Author: brueffer Date: Tue Apr 22 20:57:23 2014 New Revision: 264778 URL: http://svnweb.freebsd.org/changeset/base/264778 Log: MFC: r264386 Improve markup and remove contractions. Modified: stable/9/share/man/man4/usb_quirk.4 Directory Properties: stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/usb_quirk.4 == --- stable/9/share/man/man4/usb_quirk.4 Tue Apr 22 20:55:46 2014 (r264777) +++ stable/9/share/man/man4/usb_quirk.4 Tue Apr 22 20:57:23 2014 (r264778) @@ -49,13 +49,13 @@ swap left and right channels .It UQ_AU_INP_ASYNC input is async despite claim of adaptive .It UQ_AU_NO_FRAC -don't adjust for fractional samples +do not adjust for fractional samples .It UQ_AU_NO_XU audio device has broken extension unit .It UQ_BAD_ADC bad audio spec version number .It UQ_BAD_AUDIO -device claims audio class, but isn't +device claims audio class, but is not .It UQ_BROKEN_BIDIR printer has broken bidir mode .It UQ_BUS_POWERED @@ -67,7 +67,7 @@ device should be ignored by kbd class .It UQ_KBD_BOOTPROTO device should set the boot protocol .It UQ_MS_BAD_CLASS -doesn't identify properly +does not identify properly .It UQ_MS_LEADING_BYTE mouse sends an unknown leading byte .It UQ_MS_REVZ @@ -150,27 +150,28 @@ ejects after Huawei USB command ejects after Sierra USB command .It UQ_MSC_EJECT_SCSIEJECT ejects after SCSI eject command -0x1b000200 +.Dv 0x1b000200 .It UQ_MSC_EJECT_REZERO ejects after SCSI rezero command -0x0100 +.Dv 0x0100 .It UQ_MSC_EJECT_ZTESTOR ejects after ZTE SCSI command -0x85010101180101010101 +.Dv 0x85010101180101010101 .It UQ_MSC_EJECT_CMOTECH ejects after C-motech SCSI command -0xff52444556434847 +.Dv 0xff52444556434847 .It UQ_MSC_EJECT_WAIT wait for the device to eject .It UQ_MSC_EJECT_SAEL_M460 ejects after Sael USB commands .It UQ_MSC_EJECT_HUAWEISCSI ejects after Huawei SCSI command -0x1106 +.Dv 0x1106 .It UQ_MSC_EJECT_TCT ejects after TCT SCSI command -0x06f504025270 +.Dv 0x06f504025270 .El +.Pp See .Pa /sys/dev/usb/quirk/usb_quirk.h for the complete list of supported quirks. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264779 - stable/10/sys/dev/iwn
Author: brueffer Date: Tue Apr 22 21:02:02 2014 New Revision: 264779 URL: http://svnweb.freebsd.org/changeset/base/264779 Log: MFC: r264416 Add a missing comma between error message definitions. CID: 1199266 Found with: Coverity Prevent(tm) MFC after:1 week Modified: stable/10/sys/dev/iwn/if_iwnreg.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/iwn/if_iwnreg.h == --- stable/10/sys/dev/iwn/if_iwnreg.h Tue Apr 22 20:57:23 2014 (r264778) +++ stable/10/sys/dev/iwn/if_iwnreg.h Tue Apr 22 21:02:02 2014 (r264779) @@ -2019,7 +2019,7 @@ static const char * const iwn_fw_errmsg[ "NMI_INTERRUPT_DATA_ACTION_PT", "NMI_TRM_HW_ER", "NMI_INTERRUPT_TRM", - "NMI_INTERRUPT_BREAKPOINT" + "NMI_INTERRUPT_BREAKPOINT", "DEBUG_0", "DEBUG_1", "DEBUG_2", ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264780 - stable/9/sys/dev/iwn
Author: brueffer Date: Tue Apr 22 21:05:11 2014 New Revision: 264780 URL: http://svnweb.freebsd.org/changeset/base/264780 Log: MFC: r264416 Add a missing comma between error message definitions. CID: 1199266 Found with: Coverity Prevent(tm) Modified: stable/9/sys/dev/iwn/if_iwnreg.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/iwn/if_iwnreg.h == --- stable/9/sys/dev/iwn/if_iwnreg.hTue Apr 22 21:02:02 2014 (r264779) +++ stable/9/sys/dev/iwn/if_iwnreg.hTue Apr 22 21:05:11 2014 (r264780) @@ -1772,7 +1772,7 @@ static const char * const iwn_fw_errmsg[ "NMI_INTERRUPT_DATA_ACTION_PT", "NMI_TRM_HW_ER", "NMI_INTERRUPT_TRM", - "NMI_INTERRUPT_BREAKPOINT" + "NMI_INTERRUPT_BREAKPOINT", "DEBUG_0", "DEBUG_1", "DEBUG_2", ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264781 - head/usr.sbin/pw
Author: bapt
Date: Tue Apr 22 21:07:56 2014
New Revision: 264781
URL: http://svnweb.freebsd.org/changeset/base/264781
Log:
Simplify reading pw.conf(5) by using getline(3)
Modified:
head/usr.sbin/pw/pw.h
head/usr.sbin/pw/pw_conf.c
Modified: head/usr.sbin/pw/pw.h
==
--- head/usr.sbin/pw/pw.h Tue Apr 22 21:05:11 2014(r264780)
+++ head/usr.sbin/pw/pw.h Tue Apr 22 21:07:56 2014(r264781)
@@ -26,6 +26,7 @@
* $FreeBSD$
*/
+#define _WITH_GETLINE
#include
#include
#include
Modified: head/usr.sbin/pw/pw_conf.c
==
--- head/usr.sbin/pw/pw_conf.c Tue Apr 22 21:05:11 2014(r264780)
+++ head/usr.sbin/pw/pw_conf.c Tue Apr 22 21:07:56 2014(r264781)
@@ -226,35 +226,21 @@ newstr(char const * p)
struct userconf *
read_userconfig(char const * file)
{
- FILE *fp;
+ FILE*fp;
+ char*buf, *p;
+ size_t linecap;
+ ssize_t linelen;
+
+ buf = NULL;
+ linecap = 0;
extendarray(&config.groups, &config.numgroups, 200);
memset(config.groups, 0, config.numgroups * sizeof(char *));
if (file == NULL)
file = _PATH_PW_CONF;
- if ((fp = fopen(file, "r")) != NULL) {
- int buflen = LNBUFSZ;
- char *buf = malloc(buflen);
-
- nextline:
- while (fgets(buf, buflen, fp) != NULL) {
- char *p;
-
- while ((p = strchr(buf, '\n')) == NULL) {
- int l;
- if (extendline(&buf, &buflen, buflen + LNBUFSZ)
== -1) {
- int ch;
- while ((ch = fgetc(fp)) != '\n' && ch
!= EOF);
- goto nextline; /* Ignore it */
- }
- l = strlen(buf);
- if (fgets(buf + l, buflen - l, fp) == NULL)
- break; /* Unterminated last line */
- }
-
- if (p != NULL)
- *p = '\0';
+ if ((fp = fopen(file, "r")) != NULL) {
+ while ((linelen = getline(&buf, &linecap, fp)) > 0) {
if (*buf && (p = strtok(buf, " \t\r\n=")) != NULL && *p
!= '#') {
static char const toks[] = " \t\r\n,=";
char *q = strtok(NULL, toks);
@@ -368,7 +354,8 @@ read_userconfig(char const * file)
}
}
}
- free(buf);
+ if (linecap > 0)
+ free(buf);
fclose(fp);
}
return &config;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264782 - stable/10/usr.bin/find
Author: brueffer
Date: Tue Apr 22 21:13:25 2014
New Revision: 264782
URL: http://svnweb.freebsd.org/changeset/base/264782
Log:
MFC: r264418
Avoid double free in f_acl().
CID: 1018508
Found with: Coverity Prevent(tm)
Modified:
stable/10/usr.bin/find/function.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/find/function.c
==
--- stable/10/usr.bin/find/function.c Tue Apr 22 21:07:56 2014
(r264781)
+++ stable/10/usr.bin/find/function.c Tue Apr 22 21:13:25 2014
(r264782)
@@ -404,7 +404,6 @@ f_acl(PLAN *plan __unused, FTSENT *entry
acl_free(facl);
if (ret) {
warn("%s", entry->fts_accpath);
- acl_free(facl);
return (0);
}
if (trivial)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264783 - stable/9/usr.bin/find
Author: brueffer
Date: Tue Apr 22 21:14:50 2014
New Revision: 264783
URL: http://svnweb.freebsd.org/changeset/base/264783
Log:
MFC: r264418
Avoid double free in f_acl().
CID: 1018508
Found with: Coverity Prevent(tm)
Modified:
stable/9/usr.bin/find/function.c
Directory Properties:
stable/9/usr.bin/find/ (props changed)
Modified: stable/9/usr.bin/find/function.c
==
--- stable/9/usr.bin/find/function.cTue Apr 22 21:13:25 2014
(r264782)
+++ stable/9/usr.bin/find/function.cTue Apr 22 21:14:50 2014
(r264783)
@@ -404,7 +404,6 @@ f_acl(PLAN *plan __unused, FTSENT *entry
acl_free(facl);
if (ret) {
warn("%s", entry->fts_accpath);
- acl_free(facl);
return (0);
}
if (trivial)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264784 - stable/8/usr.bin/find
Author: brueffer
Date: Tue Apr 22 21:17:12 2014
New Revision: 264784
URL: http://svnweb.freebsd.org/changeset/base/264784
Log:
MFC: r264418
Avoid double free in f_acl().
CID: 1018508
Found with: Coverity Prevent(tm)
Modified:
stable/8/usr.bin/find/function.c
Directory Properties:
stable/8/usr.bin/find/ (props changed)
Modified: stable/8/usr.bin/find/function.c
==
--- stable/8/usr.bin/find/function.cTue Apr 22 21:14:50 2014
(r264783)
+++ stable/8/usr.bin/find/function.cTue Apr 22 21:17:12 2014
(r264784)
@@ -407,7 +407,6 @@ f_acl(PLAN *plan __unused, FTSENT *entry
acl_free(facl);
if (ret) {
warn("%s", entry->fts_accpath);
- acl_free(facl);
return (0);
}
if (trivial)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264785 - stable/10/usr.bin/ldd
Author: brueffer
Date: Tue Apr 22 21:25:03 2014
New Revision: 264785
URL: http://svnweb.freebsd.org/changeset/base/264785
Log:
MFC: r264419
Avoid double close() of a file descriptor.
CID: 1006089
Found with: Coverity Prevent(tm)
Modified:
stable/10/usr.bin/ldd/sods.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.bin/ldd/sods.c
==
--- stable/10/usr.bin/ldd/sods.cTue Apr 22 21:17:12 2014
(r264784)
+++ stable/10/usr.bin/ldd/sods.cTue Apr 22 21:25:03 2014
(r264785)
@@ -204,7 +204,6 @@ dump_file(const char *fname)
warnx("%s: this is an ELF program; use objdump to examine", fname);
++error_count;
munmap(objbase, sb.st_size);
- close(fd);
return;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264786 - stable/9/usr.bin/ldd
Author: brueffer
Date: Tue Apr 22 21:26:23 2014
New Revision: 264786
URL: http://svnweb.freebsd.org/changeset/base/264786
Log:
MFC: r264419
Avoid double close() of a file descriptor.
CID: 1006089
Found with: Coverity Prevent(tm)
Modified:
stable/9/usr.bin/ldd/sods.c
Directory Properties:
stable/9/usr.bin/ldd/ (props changed)
Modified: stable/9/usr.bin/ldd/sods.c
==
--- stable/9/usr.bin/ldd/sods.c Tue Apr 22 21:25:03 2014(r264785)
+++ stable/9/usr.bin/ldd/sods.c Tue Apr 22 21:26:23 2014(r264786)
@@ -204,7 +204,6 @@ dump_file(const char *fname)
warnx("%s: this is an ELF program; use objdump to examine", fname);
++error_count;
munmap(objbase, sb.st_size);
- close(fd);
return;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264787 - in vendor/libucl/dist: . doc include src tests utils
Author: bapt
Date: Tue Apr 22 21:56:27 2014
New Revision: 264787
URL: http://svnweb.freebsd.org/changeset/base/264787
Log:
Import libucl 0.4.0
Modified:
vendor/libucl/dist/README.md
vendor/libucl/dist/configure.ac
vendor/libucl/dist/doc/api.md
vendor/libucl/dist/doc/libucl.3
vendor/libucl/dist/include/ucl.h
vendor/libucl/dist/src/Makefile.am
vendor/libucl/dist/src/ucl_emitter.c
vendor/libucl/dist/src/ucl_hash.c
vendor/libucl/dist/src/ucl_hash.h
vendor/libucl/dist/src/ucl_internal.h
vendor/libucl/dist/src/ucl_parser.c
vendor/libucl/dist/src/ucl_schema.c
vendor/libucl/dist/src/ucl_util.c
vendor/libucl/dist/tests/test_basic.c
vendor/libucl/dist/tests/test_generate.c
vendor/libucl/dist/tests/test_schema.c
vendor/libucl/dist/utils/objdump.c
Modified: vendor/libucl/dist/README.md
==
--- vendor/libucl/dist/README.mdTue Apr 22 21:26:23 2014
(r264786)
+++ vendor/libucl/dist/README.mdTue Apr 22 21:56:27 2014
(r264787)
@@ -287,7 +287,7 @@ Each UCL object can be serialized to one
## Validation
-UCL allows validation of objects. It uses the same schema that is used for
json: [json schema v4](http://json-schema.org). UCL supports the full set of
json schema with the exception of remote references. This feature is unlikely
useful for configuration objects. Of course, schema definition can be in UCL
format instead of JSON that sinplifies schemas writing. Moreover, since UCL
supports multiple values for keys in an object it is possible to specify
generic integer constraints `maxValues` and `minValues` to define the limits of
values in a single key. UCL currently is not absolutely strict about validation
schemas themselves, therefore UCL users should supply valid schemas (as it is
defined in json-schema draft v4) to ensure that input is validated properly.
+UCL allows validation of objects. It uses the same schema that is used for
json: [json schema v4](http://json-schema.org). UCL supports the full set of
json schema with the exception of remote references. This feature is unlikely
useful for configuration objects. Of course, a schema definition can be in UCL
format instead of JSON that simplifies schemas writing. Moreover, since UCL
supports multiple values for keys in an object it is possible to specify
generic integer constraints `maxValues` and `minValues` to define the limits of
values count in a single key. UCL currently is not absolutely strict about
validation schemas themselves, therefore UCL users should supply valid schemas
(as it is defined in json-schema draft v4) to ensure that the input objects are
validated properly.
## Performance
Modified: vendor/libucl/dist/configure.ac
==
--- vendor/libucl/dist/configure.ac Tue Apr 22 21:26:23 2014
(r264786)
+++ vendor/libucl/dist/configure.ac Tue Apr 22 21:56:27 2014
(r264787)
@@ -1,5 +1,5 @@
m4_define([maj_ver], [0])
-m4_define([med_ver], [3])
+m4_define([med_ver], [4])
m4_define([min_ver], [0])
m4_define([so_version], [maj_ver:med_ver])
m4_define([ucl_version], [maj_ver.med_ver.min_ver])
@@ -48,11 +48,17 @@ AC_CHECK_HEADERS_ONCE([float.h])
AC_CHECK_HEADERS_ONCE([math.h])
dnl Example of default-disabled feature
-AC_ARG_ENABLE([urls], AS_HELP_STRING([--enable-urls], [Enable URLs fetch
(requires libfetch or libcurl)]))
+AC_ARG_ENABLE([urls], AS_HELP_STRING([--enable-urls],
+ [Enable URLs fetch (requires libfetch or libcurl) @<:@default=no@:>@]),
[],
+ [enable_urls=no])
+AC_ARG_ENABLE([regex], AS_HELP_STRING([--enable-regex],
+ [Enable regex checking for schema @<:@default=yes@:>@]), [],
+ [enable_regex=yes])
AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures],
- [Enable signatures check (requires openssl)]))
+ [Enable signatures check (requires openssl) @<:@default=no@:>@]), [],
+ [enable_signatures=no])
AC_ARG_ENABLE([utils],
- [--enable-utils Build and install utils],
+ AS_HELP_STRING([--enable-utils], [Build and install utils
@<:@default=no@:>@]),
[case "${enableval}" in
yes) utils=true ;;
no) utils=false ;;
@@ -63,11 +69,11 @@ AM_CONDITIONAL([UTILS], [test x$utils =
AS_IF([test "x$enable_signatures" = "xyes"], [
AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the
'crypto' library (-lcrypto).])
- LIBSSL_LIB="-lcrypto"
+ LIBCRYPTO_LIB="-lcrypto"
LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create()
function])])
])
-
+AC_SUBST(LIBCRYPTO_LIB)
AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
AC_SEARCH_LIBS([clock_gettime], [rt], [], [
@@ -77,11 +83,21 @@ AC_SEARCH_LIBS([clock_gettime], [rt], []
])
A
svn commit: r264788 - vendor/libucl/0.4.0
Author: bapt Date: Tue Apr 22 21:57:13 2014 New Revision: 264788 URL: http://svnweb.freebsd.org/changeset/base/264788 Log: tag import of libucl 0.4.0 Added: vendor/libucl/0.4.0/ - copied from r264787, vendor/libucl/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264789 - in head: contrib/libucl contrib/libucl/doc contrib/libucl/include contrib/libucl/src contrib/libucl/tests contrib/libucl/utils usr.sbin/pkg
Author: bapt
Date: Tue Apr 22 22:02:06 2014
New Revision: 264789
URL: http://svnweb.freebsd.org/changeset/base/264789
Log:
Import libucl 0.4.0
Adapt pkg(7) to the new libucl API
Modified:
head/contrib/libucl/README.md
head/contrib/libucl/configure.ac
head/contrib/libucl/doc/api.md
head/contrib/libucl/doc/libucl.3
head/contrib/libucl/include/ucl.h
head/contrib/libucl/src/Makefile.am
head/contrib/libucl/src/ucl_emitter.c
head/contrib/libucl/src/ucl_hash.c
head/contrib/libucl/src/ucl_hash.h
head/contrib/libucl/src/ucl_internal.h
head/contrib/libucl/src/ucl_parser.c
head/contrib/libucl/src/ucl_schema.c
head/contrib/libucl/src/ucl_util.c
head/contrib/libucl/tests/test_basic.c
head/contrib/libucl/tests/test_generate.c
head/contrib/libucl/tests/test_schema.c
head/contrib/libucl/utils/objdump.c
head/usr.sbin/pkg/config.c
head/usr.sbin/pkg/pkg.c
Directory Properties:
head/contrib/libucl/ (props changed)
Modified: head/contrib/libucl/README.md
==
--- head/contrib/libucl/README.md Tue Apr 22 21:57:13 2014
(r264788)
+++ head/contrib/libucl/README.md Tue Apr 22 22:02:06 2014
(r264789)
@@ -287,7 +287,7 @@ Each UCL object can be serialized to one
## Validation
-UCL allows validation of objects. It uses the same schema that is used for
json: [json schema v4](http://json-schema.org). UCL supports the full set of
json schema with the exception of remote references. This feature is unlikely
useful for configuration objects. Of course, schema definition can be in UCL
format instead of JSON that sinplifies schemas writing. Moreover, since UCL
supports multiple values for keys in an object it is possible to specify
generic integer constraints `maxValues` and `minValues` to define the limits of
values in a single key. UCL currently is not absolutely strict about validation
schemas themselves, therefore UCL users should supply valid schemas (as it is
defined in json-schema draft v4) to ensure that input is validated properly.
+UCL allows validation of objects. It uses the same schema that is used for
json: [json schema v4](http://json-schema.org). UCL supports the full set of
json schema with the exception of remote references. This feature is unlikely
useful for configuration objects. Of course, a schema definition can be in UCL
format instead of JSON that simplifies schemas writing. Moreover, since UCL
supports multiple values for keys in an object it is possible to specify
generic integer constraints `maxValues` and `minValues` to define the limits of
values count in a single key. UCL currently is not absolutely strict about
validation schemas themselves, therefore UCL users should supply valid schemas
(as it is defined in json-schema draft v4) to ensure that the input objects are
validated properly.
## Performance
Modified: head/contrib/libucl/configure.ac
==
--- head/contrib/libucl/configure.acTue Apr 22 21:57:13 2014
(r264788)
+++ head/contrib/libucl/configure.acTue Apr 22 22:02:06 2014
(r264789)
@@ -1,5 +1,5 @@
m4_define([maj_ver], [0])
-m4_define([med_ver], [3])
+m4_define([med_ver], [4])
m4_define([min_ver], [0])
m4_define([so_version], [maj_ver:med_ver])
m4_define([ucl_version], [maj_ver.med_ver.min_ver])
@@ -48,11 +48,17 @@ AC_CHECK_HEADERS_ONCE([float.h])
AC_CHECK_HEADERS_ONCE([math.h])
dnl Example of default-disabled feature
-AC_ARG_ENABLE([urls], AS_HELP_STRING([--enable-urls], [Enable URLs fetch
(requires libfetch or libcurl)]))
+AC_ARG_ENABLE([urls], AS_HELP_STRING([--enable-urls],
+ [Enable URLs fetch (requires libfetch or libcurl) @<:@default=no@:>@]),
[],
+ [enable_urls=no])
+AC_ARG_ENABLE([regex], AS_HELP_STRING([--enable-regex],
+ [Enable regex checking for schema @<:@default=yes@:>@]), [],
+ [enable_regex=yes])
AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures],
- [Enable signatures check (requires openssl)]))
+ [Enable signatures check (requires openssl) @<:@default=no@:>@]), [],
+ [enable_signatures=no])
AC_ARG_ENABLE([utils],
- [--enable-utils Build and install utils],
+ AS_HELP_STRING([--enable-utils], [Build and install utils
@<:@default=no@:>@]),
[case "${enableval}" in
yes) utils=true ;;
no) utils=false ;;
@@ -63,11 +69,11 @@ AM_CONDITIONAL([UTILS], [test x$utils =
AS_IF([test "x$enable_signatures" = "xyes"], [
AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the
'crypto' library (-lcrypto).])
- LIBSSL_LIB="-lcrypto"
+ LIBCRYPTO_LIB="-lcrypto"
LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create()
function])])
])
-
+AC_SUBST(LI
svn commit: r264791 - vendor/byacc/20140409
Author: bapt Date: Tue Apr 22 22:12:24 2014 New Revision: 264791 URL: http://svnweb.freebsd.org/changeset/base/264791 Log: Tag import of byacc 20140409 Added: vendor/byacc/20140409/ - copied from r264790, vendor/byacc/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264792 - stable/10/release/arm
Author: gjb
Date: Wed Apr 23 01:27:53 2014
New Revision: 264792
URL: http://svnweb.freebsd.org/changeset/base/264792
Log:
MFC r264518, r264697, r264698, r264703:
r264518:
Fix armv6 build failure: "armv6-freebsd-gcc: not found"
r264697:
When building the 'xdev' target when WITH_GCC=1 and
WITHOUT_CLANG_IS_CC=1, it appears WITHOUT_CLANG=1 must
also be set.
While here, reorder the lines to put the WITH_* and
WITHOUT_* entries on the same line.
r264698:
Fix EOL escape.
r264703:
Apply a slightly different color hammer to arm/release.sh:
- gcc(1) fails to build usr.bin/dtc
- lack of WITH_GNUCXX=1 causes cc1plus(1) calls to fail
- u-boot fails to build with clang (hard-coded gcc(1) calls)
Implement the proper incantation of WITH_/WITHOUT_ knobs
to get arm snapshot builds working again.
Since the cc(1) binary no longer needs to be cc(1) instead of
clang(1), remove the chroot(8) post-install cc(1) overwrite.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/arm/release.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/arm/release.sh
==
--- stable/10/release/arm/release.shTue Apr 22 22:12:24 2014
(r264791)
+++ stable/10/release/arm/release.shWed Apr 23 01:27:53 2014
(r264792)
@@ -92,14 +92,10 @@ install_uboot() {
}
main() {
- # Build gcc for use in the chroot for arm builds.
- # This is not '-j'-safe, so force '-j1' to allow using
- # additional, non-'-j' options specified in WORLD_FLAGS.
- eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
- WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
# Build the 'xdev' target for crochet.
eval chroot ${CHROOTDIR} make -C /usr/src \
- XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} WITH_GCC=1 \
+ WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \
+ XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
${WORLD_FLAGS} xdev
# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264793 - head/release/arm
Author: gjb
Date: Wed Apr 23 01:47:07 2014
New Revision: 264793
URL: http://svnweb.freebsd.org/changeset/base/264793
Log:
Play musical-KNOBS a bit more with release/arm/release.sh.
For stable/10, r264703 sets the correct WITH/WITHOUT
knobs to get xdev built with the arm-freebsd-gcc binary
installed. Unfortunately, the same fix does not work on
head/.
Also, quite to my amazement, WITH_GCC=1 and WITH_GNUCXX=1
causes xdev to fail spectactularly at least on r264791.
The situation as it stands is:
- gcc(1) is needed for the u-boot build.
- cc(1) *cannot* be clang(1)
To shoe-horn the toolchain to make 'xdev' give what is
needed, remove WITH_GNUCXX=1 and add WITH_GCC_BOOTSTRAP=1.
MFC After:1 week
X-MFC-To: stable/10 only
X-MFC-Note: after stable/10 is broken in this way...
Sponsored by: The FreeBSD Foundation
Modified:
head/release/arm/release.sh
Modified: head/release/arm/release.sh
==
--- head/release/arm/release.sh Wed Apr 23 01:27:53 2014(r264792)
+++ head/release/arm/release.sh Wed Apr 23 01:47:07 2014(r264793)
@@ -94,7 +94,7 @@ install_uboot() {
main() {
# Build the 'xdev' target for crochet.
eval chroot ${CHROOTDIR} make -C /usr/src \
- WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \
+ WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \
XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
${WORLD_FLAGS} xdev
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264794 - head/release/arm
Author: gjb
Date: Wed Apr 23 02:01:22 2014
New Revision: 264794
URL: http://svnweb.freebsd.org/changeset/base/264794
Log:
Move xdev knobs from release/arm/release.sh and into an
XDEV_FLAGS variable in ${KERNCONF}.conf file.
MFC after:3 days
X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch
Sponsored by: The FreeBSD Foundation
Modified:
head/release/arm/BEAGLEBONE.conf
head/release/arm/PANDABOARD.conf
head/release/arm/RPI-B.conf
head/release/arm/WANDBOARD-QUAD.conf
head/release/arm/ZEDBOARD.conf
head/release/arm/release.sh
Modified: head/release/arm/BEAGLEBONE.conf
==
--- head/release/arm/BEAGLEBONE.confWed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/BEAGLEBONE.confWed Apr 23 02:01:22 2014
(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="BEAGLEBONE"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/PANDABOARD.conf
==
--- head/release/arm/PANDABOARD.confWed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/PANDABOARD.confWed Apr 23 02:01:22 2014
(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="PANDABOARD"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/RPI-B.conf
==
--- head/release/arm/RPI-B.conf Wed Apr 23 01:47:07 2014(r264793)
+++ head/release/arm/RPI-B.conf Wed Apr 23 02:01:22 2014(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="RPI-B"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/WANDBOARD-QUAD.conf
==
--- head/release/arm/WANDBOARD-QUAD.confWed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/WANDBOARD-QUAD.confWed Apr 23 02:01:22 2014
(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="WANDBOARD-QUAD"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/ZEDBOARD.conf
==
--- head/release/arm/ZEDBOARD.conf Wed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/ZEDBOARD.conf Wed Apr 23 02:01:22 2014
(r264794)
@@ -21,6 +21,7 @@ CHROOTDIR="/scratch"
EMBEDDEDBUILD=1
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="ZEDBOARD"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/release.sh
==
--- head/release/arm/release.sh Wed Apr 23 01:47:07 2014(r264793)
+++ head/release/arm/release.sh Wed Apr 23 02:01:22 2014(r264794)
@@ -94,8 +94,7 @@ install_uboot() {
main() {
# Build the 'xdev' target for crochet.
eval chroot ${CHROOTDIR} make -C /usr/src \
- WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \
- XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
+ ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
${WORLD_FLAGS} xdev
# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264795 - head/sys/kern
Author: bdrewery
Date: Wed Apr 23 02:21:17 2014
New Revision: 264795
URL: http://svnweb.freebsd.org/changeset/base/264795
Log:
Fix grammar error and trailing newline.
Submitted by: danfe
MFC after:3 days
Modified:
head/sys/kern/subr_prf.c
Modified: head/sys/kern/subr_prf.c
==
--- head/sys/kern/subr_prf.cWed Apr 23 02:01:22 2014(r264794)
+++ head/sys/kern/subr_prf.cWed Apr 23 02:21:17 2014(r264795)
@@ -914,7 +914,7 @@ number:
while (percent < fmt)
PCHAR(*percent++);
/*
-* Since we ignore an formatting argument it is no
+* Since we ignore a formatting argument it is no
* longer safe to obey the remaining formatting
* arguments as the arguments will no longer match
* the format specs.
@@ -1122,4 +1122,3 @@ hexdump(const void *ptr, int length, con
printf("\n");
}
}
-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264796 - in stable/10: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: markj
Date: Wed Apr 23 03:26:29 2014
New Revision: 264796
URL: http://svnweb.freebsd.org/changeset/base/264796
Log:
MFC r262596:
4478 dtrace_dof_maxsize is far too small
illumos/illumos-gate@d339a29bb4765c4b6883a935cf69b669cd05bca0
Added:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
- copied unchanged from r262596,
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
Directory Properties:
stable/10/ (props changed)
Copied:
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
(from r262596,
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
Wed Apr 23 03:26:29 2014(r264796, copy of r262596,
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh)
@@ -0,0 +1,97 @@
+#
+# 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 (c) 2012, Joyent, Inc. All rights reserved.
+#
+
+let j=8
+
+enable()
+{
+ prog=/var/tmp/dtest.$$.d
+ err=/var/tmp/dtest.$$.err
+
+ nawk -v nprobes=$1 'BEGIN { \
+ for (i = 0; i < nprobes - 1; i++) { \
+ printf("dtrace:::BEGIN,\n");\
+ } \
+ \
+ printf("dtrace:::BEGIN { exit(0); }\n");\
+ }' /dev/null > $prog
+
+ dtrace -qs $prog > /dev/null 2> $err
+
+ if [[ "$?" -eq 0 ]]; then
+ return 0
+ else
+ if ! grep "DIF program exceeds maximum program size" $err \
+ 1> /dev/null 2>&1 ; then
+ echo "failed to enable $prog: `cat $err`"
+ exit 1
+ fi
+
+ return 1
+ fi
+}
+
+#
+# First, establish an upper bound
+#
+let upper=1
+
+while enable $upper ; do
+ let lower=upper
+ let upper=upper+upper
+ echo success at $lower, raised to $upper
+done
+
+#
+# Now search for the highest value that can be enabled
+#
+while [[ "$lower" -lt "$upper" ]]; do
+ let guess=$(((lower + upper) / 2))
+ echo "lower is $lower; upper is $upper; guess is $guess\c"
+
+ if enable $guess ; then
+ if [[ $((upper - lower)) -le 2 ]]; then
+ let upper=guess
+ fi
+
+ echo " (success)"
+ let lower=guess
+ else
+ echo " (failure)"
+ let upper=guess
+ fi
+done
+
+let expected=1
+
+if [[ "$lower" -lt "$expected" ]]; then
+ echo "expected support for enablings of at least $expected probes; \c"
+ echo "found $lower"
+ exit 1
+fi
+
+echo "maximum supported enabled probes found to be $lower"
+exit 0
+
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Apr
23 02:21:17 2014(r264795)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Apr
23 03:26:29 2014(r264796)
@@ -155,7 +155,7 @@
intdtrace_destructive_disallow = 0;
dtrace_optval_tdtrace_nonroot_maxsize = (16 * 1024 * 1024);
size_t dtrace_difo_maxsize = (256 * 1024);
-dtrace_optval_tdtrace_dof_maxsize = (256 * 1024);
+dtrace_optval_tdtrace_dof_maxsize = (8 * 1024 * 1024);
size_t dtrace_global_maxsize = (16 * 1024);
size_t dtrace_actions_max = (16 * 1024);
size_t dtrace_retain_max = 1024;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264797 - in stable/9: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: markj
Date: Wed Apr 23 03:30:00 2014
New Revision: 264797
URL: http://svnweb.freebsd.org/changeset/base/264797
Log:
MFC r262596:
4478 dtrace_dof_maxsize is far too small
illumos/illumos-gate@d339a29bb4765c4b6883a935cf69b669cd05bca0
Added:
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
- copied unchanged from r262596,
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
Directory Properties:
stable/9/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Copied:
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
(from r262596,
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh
Wed Apr 23 03:30:00 2014(r264797, copy of r262596,
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dofmax.ksh)
@@ -0,0 +1,97 @@
+#
+# 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 (c) 2012, Joyent, Inc. All rights reserved.
+#
+
+let j=8
+
+enable()
+{
+ prog=/var/tmp/dtest.$$.d
+ err=/var/tmp/dtest.$$.err
+
+ nawk -v nprobes=$1 'BEGIN { \
+ for (i = 0; i < nprobes - 1; i++) { \
+ printf("dtrace:::BEGIN,\n");\
+ } \
+ \
+ printf("dtrace:::BEGIN { exit(0); }\n");\
+ }' /dev/null > $prog
+
+ dtrace -qs $prog > /dev/null 2> $err
+
+ if [[ "$?" -eq 0 ]]; then
+ return 0
+ else
+ if ! grep "DIF program exceeds maximum program size" $err \
+ 1> /dev/null 2>&1 ; then
+ echo "failed to enable $prog: `cat $err`"
+ exit 1
+ fi
+
+ return 1
+ fi
+}
+
+#
+# First, establish an upper bound
+#
+let upper=1
+
+while enable $upper ; do
+ let lower=upper
+ let upper=upper+upper
+ echo success at $lower, raised to $upper
+done
+
+#
+# Now search for the highest value that can be enabled
+#
+while [[ "$lower" -lt "$upper" ]]; do
+ let guess=$(((lower + upper) / 2))
+ echo "lower is $lower; upper is $upper; guess is $guess\c"
+
+ if enable $guess ; then
+ if [[ $((upper - lower)) -le 2 ]]; then
+ let upper=guess
+ fi
+
+ echo " (success)"
+ let lower=guess
+ else
+ echo " (failure)"
+ let upper=guess
+ fi
+done
+
+let expected=1
+
+if [[ "$lower" -lt "$expected" ]]; then
+ echo "expected support for enablings of at least $expected probes; \c"
+ echo "found $lower"
+ exit 1
+fi
+
+echo "maximum supported enabled probes found to be $lower"
+exit 0
+
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cWed Apr
23 03:26:29 2014(r264796)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cWed Apr
23 03:30:00 2014(r264797)
@@ -155,7 +155,7 @@
intdtrace_destructive_disallow = 0;
dtrace_optval_tdtrace_nonroot_maxsize = (16 * 1024 * 1024);
size_t dtrace_difo_maxsize = (256 * 1024);
-dtrace_optval_tdtrace_dof_maxsize = (256 * 1024);
+dtrace_optval_tdtrace_dof_maxsize = (8 * 1024 * 1024);
size_t dtrace_global_maxsize = (16 * 1024);
size_t dtrace_actions_max = (16 * 1024);
size_t dtrace_retain_max = 1024;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubs
Re: svn commit: r264793 - head/release/arm
On Apr 22, 2014, at 6:47 PM, Glen Barber wrote:
> Author: gjb
> Date: Wed Apr 23 01:47:07 2014
> New Revision: 264793
> URL: http://svnweb.freebsd.org/changeset/base/264793
>
> Log:
> Play musical-KNOBS a bit more with release/arm/release.sh.
>
> For stable/10, r264703 sets the correct WITH/WITHOUT
> knobs to get xdev built with the arm-freebsd-gcc binary
> installed. Unfortunately, the same fix does not work on
> head/.
>
> Also, quite to my amazement, WITH_GCC=1 and WITH_GNUCXX=1
> causes xdev to fail spectactularly at least on r264791.
>
> The situation as it stands is:
>
> - gcc(1) is needed for the u-boot build.
> - cc(1) *cannot* be clang(1)
>
> To shoe-horn the toolchain to make 'xdev' give what is
> needed, remove WITH_GNUCXX=1 and add WITH_GCC_BOOTSTRAP=1.
You shouldn’t need this, since that should be the default with
WITHOUT_CLANG_IS_CC… You fixed the wrong bug :)
Warner
> MFC After: 1 week
> X-MFC-To:stable/10 only
> X-MFC-Note: after stable/10 is broken in this way...
> Sponsored by:The FreeBSD Foundation
>
> Modified:
> head/release/arm/release.sh
>
> Modified: head/release/arm/release.sh
> ==
> --- head/release/arm/release.sh Wed Apr 23 01:27:53 2014
> (r264792)
> +++ head/release/arm/release.sh Wed Apr 23 01:47:07 2014
> (r264793)
> @@ -94,7 +94,7 @@ install_uboot() {
> main() {
> # Build the 'xdev' target for crochet.
> eval chroot ${CHROOTDIR} make -C /usr/src \
> - WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \
> + WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \
> XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
> ${WORLD_FLAGS} xdev
>
>
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264794 - head/release/arm
Ditto. This should be backed out and you should make whoever broke this fix it
in head.
Warner
On Apr 22, 2014, at 7:01 PM, Glen Barber wrote:
> Author: gjb
> Date: Wed Apr 23 02:01:22 2014
> New Revision: 264794
> URL: http://svnweb.freebsd.org/changeset/base/264794
>
> Log:
> Move xdev knobs from release/arm/release.sh and into an
> XDEV_FLAGS variable in ${KERNCONF}.conf file.
>
> MFC after: 3 days
> X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch
> Sponsored by:The FreeBSD Foundation
>
> Modified:
> head/release/arm/BEAGLEBONE.conf
> head/release/arm/PANDABOARD.conf
> head/release/arm/RPI-B.conf
> head/release/arm/WANDBOARD-QUAD.conf
> head/release/arm/ZEDBOARD.conf
> head/release/arm/release.sh
>
> Modified: head/release/arm/BEAGLEBONE.conf
> ==
> --- head/release/arm/BEAGLEBONE.conf Wed Apr 23 01:47:07 2014
> (r264793)
> +++ head/release/arm/BEAGLEBONE.conf Wed Apr 23 02:01:22 2014
> (r264794)
> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> EMBEDDEDPORTS="lang/python textproc/gsed"
> XDEV="arm"
> XDEV_ARCH="armv6"
> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> KERNEL="BEAGLEBONE"
> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> CROCHETBRANCH="trunk"
>
> Modified: head/release/arm/PANDABOARD.conf
> ==
> --- head/release/arm/PANDABOARD.conf Wed Apr 23 01:47:07 2014
> (r264793)
> +++ head/release/arm/PANDABOARD.conf Wed Apr 23 02:01:22 2014
> (r264794)
> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> EMBEDDEDPORTS="lang/python textproc/gsed"
> XDEV="arm"
> XDEV_ARCH="armv6"
> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> KERNEL="PANDABOARD"
> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> CROCHETBRANCH="trunk"
>
> Modified: head/release/arm/RPI-B.conf
> ==
> --- head/release/arm/RPI-B.conf Wed Apr 23 01:47:07 2014
> (r264793)
> +++ head/release/arm/RPI-B.conf Wed Apr 23 02:01:22 2014
> (r264794)
> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> EMBEDDEDPORTS="lang/python textproc/gsed"
> XDEV="arm"
> XDEV_ARCH="armv6"
> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> KERNEL="RPI-B"
> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> CROCHETBRANCH="trunk"
>
> Modified: head/release/arm/WANDBOARD-QUAD.conf
> ==
> --- head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 01:47:07 2014
> (r264793)
> +++ head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 02:01:22 2014
> (r264794)
> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> EMBEDDEDPORTS="lang/python textproc/gsed"
> XDEV="arm"
> XDEV_ARCH="armv6"
> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> KERNEL="WANDBOARD-QUAD"
> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> CROCHETBRANCH="trunk"
>
> Modified: head/release/arm/ZEDBOARD.conf
> ==
> --- head/release/arm/ZEDBOARD.confWed Apr 23 01:47:07 2014
> (r264793)
> +++ head/release/arm/ZEDBOARD.confWed Apr 23 02:01:22 2014
> (r264794)
> @@ -21,6 +21,7 @@ CHROOTDIR="/scratch"
> EMBEDDEDBUILD=1
> XDEV="arm"
> XDEV_ARCH="armv6"
> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> KERNEL="ZEDBOARD"
> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> CROCHETBRANCH="trunk"
>
> Modified: head/release/arm/release.sh
> ==
> --- head/release/arm/release.sh Wed Apr 23 01:47:07 2014
> (r264793)
> +++ head/release/arm/release.sh Wed Apr 23 02:01:22 2014
> (r264794)
> @@ -94,8 +94,7 @@ install_uboot() {
> main() {
> # Build the 'xdev' target for crochet.
> eval chroot ${CHROOTDIR} make -C /usr/src \
> - WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \
> - XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
> + ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
> ${WORLD_FLAGS} xdev
>
> # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
>
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264794 - head/release/arm
On Tue, Apr 22, 2014 at 10:02:03PM -0700, Warner Losh wrote:
> Ditto. This should be backed out and you should make whoever broke this fix
> it in head.
>
Well, this commit only moves where the definition is, from the script
itself to the configuration file.
But, to be fair, I think you broke it in r264660.
Glen
> Warner
>
> On Apr 22, 2014, at 7:01 PM, Glen Barber wrote:
>
> > Author: gjb
> > Date: Wed Apr 23 02:01:22 2014
> > New Revision: 264794
> > URL: http://svnweb.freebsd.org/changeset/base/264794
> >
> > Log:
> > Move xdev knobs from release/arm/release.sh and into an
> > XDEV_FLAGS variable in ${KERNCONF}.conf file.
> >
> > MFC after: 3 days
> > X-MFC-Note:fix stable/10 XDEV_FLAGS local for branch
> > Sponsored by: The FreeBSD Foundation
> >
> > Modified:
> > head/release/arm/BEAGLEBONE.conf
> > head/release/arm/PANDABOARD.conf
> > head/release/arm/RPI-B.conf
> > head/release/arm/WANDBOARD-QUAD.conf
> > head/release/arm/ZEDBOARD.conf
> > head/release/arm/release.sh
> >
> > Modified: head/release/arm/BEAGLEBONE.conf
> > ==
> > --- head/release/arm/BEAGLEBONE.confWed Apr 23 01:47:07 2014
> > (r264793)
> > +++ head/release/arm/BEAGLEBONE.confWed Apr 23 02:01:22 2014
> > (r264794)
> > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > EMBEDDEDPORTS="lang/python textproc/gsed"
> > XDEV="arm"
> > XDEV_ARCH="armv6"
> > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > KERNEL="BEAGLEBONE"
> > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > CROCHETBRANCH="trunk"
> >
> > Modified: head/release/arm/PANDABOARD.conf
> > ==
> > --- head/release/arm/PANDABOARD.confWed Apr 23 01:47:07 2014
> > (r264793)
> > +++ head/release/arm/PANDABOARD.confWed Apr 23 02:01:22 2014
> > (r264794)
> > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > EMBEDDEDPORTS="lang/python textproc/gsed"
> > XDEV="arm"
> > XDEV_ARCH="armv6"
> > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > KERNEL="PANDABOARD"
> > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > CROCHETBRANCH="trunk"
> >
> > Modified: head/release/arm/RPI-B.conf
> > ==
> > --- head/release/arm/RPI-B.conf Wed Apr 23 01:47:07 2014
> > (r264793)
> > +++ head/release/arm/RPI-B.conf Wed Apr 23 02:01:22 2014
> > (r264794)
> > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > EMBEDDEDPORTS="lang/python textproc/gsed"
> > XDEV="arm"
> > XDEV_ARCH="armv6"
> > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > KERNEL="RPI-B"
> > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > CROCHETBRANCH="trunk"
> >
> > Modified: head/release/arm/WANDBOARD-QUAD.conf
> > ==
> > --- head/release/arm/WANDBOARD-QUAD.confWed Apr 23 01:47:07 2014
> > (r264793)
> > +++ head/release/arm/WANDBOARD-QUAD.confWed Apr 23 02:01:22 2014
> > (r264794)
> > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > EMBEDDEDPORTS="lang/python textproc/gsed"
> > XDEV="arm"
> > XDEV_ARCH="armv6"
> > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > KERNEL="WANDBOARD-QUAD"
> > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > CROCHETBRANCH="trunk"
> >
> > Modified: head/release/arm/ZEDBOARD.conf
> > ==
> > --- head/release/arm/ZEDBOARD.conf Wed Apr 23 01:47:07 2014
> > (r264793)
> > +++ head/release/arm/ZEDBOARD.conf Wed Apr 23 02:01:22 2014
> > (r264794)
> > @@ -21,6 +21,7 @@ CHROOTDIR="/scratch"
> > EMBEDDEDBUILD=1
> > XDEV="arm"
> > XDEV_ARCH="armv6"
> > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > KERNEL="ZEDBOARD"
> > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > CROCHETBRANCH="trunk"
> >
> > Modified: head/release/arm/release.sh
> > ==
> > --- head/release/arm/release.sh Wed Apr 23 01:47:07 2014
> > (r264793)
> > +++ head/release/arm/release.sh Wed Apr 23 02:01:22 2014
> > (r264794)
> > @@ -94,8 +94,7 @@ install_uboot() {
> > main() {
> > # Build the 'xdev' target for crochet.
> > eval chroot ${CHROOTDIR} make -C /usr/src \
> > - WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \
> > - XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
> > + ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
> > ${WORLD_FLAGS} xdev
> >
> > # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
> >
>
pgpz1lqXk0Tx6.pgp
Description: PGP signature
Re: svn commit: r264794 - head/release/arm
On Wed, Apr 23, 2014 at 01:09:23AM -0400, Glen Barber wrote:
> On Tue, Apr 22, 2014 at 10:02:03PM -0700, Warner Losh wrote:
> > Ditto. This should be backed out and you should make whoever broke this fix
> > it in head.
> >
>
> Well, this commit only moves where the definition is, from the script
> itself to the configuration file.
>
> But, to be fair, I think you broke it in r264660.
>
To clarify further, if it was you that did break it in head/, I am not
complaining about it - I fixed the use case I need.
What I *want* to happen is for the WITH_CLANG_IS_CC and
WITHOUT_CLANG_IS_CC to stop conflicting with WITH_GCC, and additional
convoluted and unnecessary knobs to go away.
But you already know that. :)
Glen
> Glen
>
> > Warner
> >
> > On Apr 22, 2014, at 7:01 PM, Glen Barber wrote:
> >
> > > Author: gjb
> > > Date: Wed Apr 23 02:01:22 2014
> > > New Revision: 264794
> > > URL: http://svnweb.freebsd.org/changeset/base/264794
> > >
> > > Log:
> > > Move xdev knobs from release/arm/release.sh and into an
> > > XDEV_FLAGS variable in ${KERNCONF}.conf file.
> > >
> > > MFC after: 3 days
> > > X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch
> > > Sponsored by:The FreeBSD Foundation
> > >
> > > Modified:
> > > head/release/arm/BEAGLEBONE.conf
> > > head/release/arm/PANDABOARD.conf
> > > head/release/arm/RPI-B.conf
> > > head/release/arm/WANDBOARD-QUAD.conf
> > > head/release/arm/ZEDBOARD.conf
> > > head/release/arm/release.sh
> > >
> > > Modified: head/release/arm/BEAGLEBONE.conf
> > > ==
> > > --- head/release/arm/BEAGLEBONE.conf Wed Apr 23 01:47:07 2014
> > > (r264793)
> > > +++ head/release/arm/BEAGLEBONE.conf Wed Apr 23 02:01:22 2014
> > > (r264794)
> > > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > > EMBEDDEDPORTS="lang/python textproc/gsed"
> > > XDEV="arm"
> > > XDEV_ARCH="armv6"
> > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > > KERNEL="BEAGLEBONE"
> > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > > CROCHETBRANCH="trunk"
> > >
> > > Modified: head/release/arm/PANDABOARD.conf
> > > ==
> > > --- head/release/arm/PANDABOARD.conf Wed Apr 23 01:47:07 2014
> > > (r264793)
> > > +++ head/release/arm/PANDABOARD.conf Wed Apr 23 02:01:22 2014
> > > (r264794)
> > > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > > EMBEDDEDPORTS="lang/python textproc/gsed"
> > > XDEV="arm"
> > > XDEV_ARCH="armv6"
> > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > > KERNEL="PANDABOARD"
> > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > > CROCHETBRANCH="trunk"
> > >
> > > Modified: head/release/arm/RPI-B.conf
> > > ==
> > > --- head/release/arm/RPI-B.conf Wed Apr 23 01:47:07 2014
> > > (r264793)
> > > +++ head/release/arm/RPI-B.conf Wed Apr 23 02:01:22 2014
> > > (r264794)
> > > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > > EMBEDDEDPORTS="lang/python textproc/gsed"
> > > XDEV="arm"
> > > XDEV_ARCH="armv6"
> > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > > KERNEL="RPI-B"
> > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > > CROCHETBRANCH="trunk"
> > >
> > > Modified: head/release/arm/WANDBOARD-QUAD.conf
> > > ==
> > > --- head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 01:47:07 2014
> > > (r264793)
> > > +++ head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 02:01:22 2014
> > > (r264794)
> > > @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
> > > EMBEDDEDPORTS="lang/python textproc/gsed"
> > > XDEV="arm"
> > > XDEV_ARCH="armv6"
> > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > > KERNEL="WANDBOARD-QUAD"
> > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > > CROCHETBRANCH="trunk"
> > >
> > > Modified: head/release/arm/ZEDBOARD.conf
> > > ==
> > > --- head/release/arm/ZEDBOARD.confWed Apr 23 01:47:07 2014
> > > (r264793)
> > > +++ head/release/arm/ZEDBOARD.confWed Apr 23 02:01:22 2014
> > > (r264794)
> > > @@ -21,6 +21,7 @@ CHROOTDIR="/scratch"
> > > EMBEDDEDBUILD=1
> > > XDEV="arm"
> > > XDEV_ARCH="armv6"
> > > +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
> > > KERNEL="ZEDBOARD"
> > > CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
> > > CROCHETBRANCH="trunk"
> > >
> > > Modified: head/release/arm/release.sh
> > > ==
> > > --- head/release/arm/release.sh Wed Apr 23 01:47:07 2014
> > > (r264793)
> > > +++ head/release/arm/release.sh We
Re: svn commit: r264794 - head/release/arm
On Apr 22, 2014, at 10:09 PM, Glen Barber wrote:
> On Tue, Apr 22, 2014 at 10:02:03PM -0700, Warner Losh wrote:
>> Ditto. This should be backed out and you should make whoever broke this fix
>> it in head.
>>
>
> Well, this commit only moves where the definition is, from the script
> itself to the configuration file.
>
> But, to be fair, I think you broke it in r264660.
i’m pretty sure I broke it and was poking fun at myself until I can get it
fixed :)
Warner
> Glen
>
>> Warner
>>
>> On Apr 22, 2014, at 7:01 PM, Glen Barber wrote:
>>
>>> Author: gjb
>>> Date: Wed Apr 23 02:01:22 2014
>>> New Revision: 264794
>>> URL: http://svnweb.freebsd.org/changeset/base/264794
>>>
>>> Log:
>>> Move xdev knobs from release/arm/release.sh and into an
>>> XDEV_FLAGS variable in ${KERNCONF}.conf file.
>>>
>>> MFC after: 3 days
>>> X-MFC-Note: fix stable/10 XDEV_FLAGS local for branch
>>> Sponsored by: The FreeBSD Foundation
>>>
>>> Modified:
>>> head/release/arm/BEAGLEBONE.conf
>>> head/release/arm/PANDABOARD.conf
>>> head/release/arm/RPI-B.conf
>>> head/release/arm/WANDBOARD-QUAD.conf
>>> head/release/arm/ZEDBOARD.conf
>>> head/release/arm/release.sh
>>>
>>> Modified: head/release/arm/BEAGLEBONE.conf
>>> ==
>>> --- head/release/arm/BEAGLEBONE.confWed Apr 23 01:47:07 2014
>>> (r264793)
>>> +++ head/release/arm/BEAGLEBONE.confWed Apr 23 02:01:22 2014
>>> (r264794)
>>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
>>> EMBEDDEDPORTS="lang/python textproc/gsed"
>>> XDEV="arm"
>>> XDEV_ARCH="armv6"
>>> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
>>> KERNEL="BEAGLEBONE"
>>> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
>>> CROCHETBRANCH="trunk"
>>>
>>> Modified: head/release/arm/PANDABOARD.conf
>>> ==
>>> --- head/release/arm/PANDABOARD.confWed Apr 23 01:47:07 2014
>>> (r264793)
>>> +++ head/release/arm/PANDABOARD.confWed Apr 23 02:01:22 2014
>>> (r264794)
>>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
>>> EMBEDDEDPORTS="lang/python textproc/gsed"
>>> XDEV="arm"
>>> XDEV_ARCH="armv6"
>>> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
>>> KERNEL="PANDABOARD"
>>> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
>>> CROCHETBRANCH="trunk"
>>>
>>> Modified: head/release/arm/RPI-B.conf
>>> ==
>>> --- head/release/arm/RPI-B.conf Wed Apr 23 01:47:07 2014
>>> (r264793)
>>> +++ head/release/arm/RPI-B.conf Wed Apr 23 02:01:22 2014
>>> (r264794)
>>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
>>> EMBEDDEDPORTS="lang/python textproc/gsed"
>>> XDEV="arm"
>>> XDEV_ARCH="armv6"
>>> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
>>> KERNEL="RPI-B"
>>> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
>>> CROCHETBRANCH="trunk"
>>>
>>> Modified: head/release/arm/WANDBOARD-QUAD.conf
>>> ==
>>> --- head/release/arm/WANDBOARD-QUAD.confWed Apr 23 01:47:07 2014
>>> (r264793)
>>> +++ head/release/arm/WANDBOARD-QUAD.confWed Apr 23 02:01:22 2014
>>> (r264794)
>>> @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
>>> EMBEDDEDPORTS="lang/python textproc/gsed"
>>> XDEV="arm"
>>> XDEV_ARCH="armv6"
>>> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
>>> KERNEL="WANDBOARD-QUAD"
>>> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
>>> CROCHETBRANCH="trunk"
>>>
>>> Modified: head/release/arm/ZEDBOARD.conf
>>> ==
>>> --- head/release/arm/ZEDBOARD.conf Wed Apr 23 01:47:07 2014
>>> (r264793)
>>> +++ head/release/arm/ZEDBOARD.conf Wed Apr 23 02:01:22 2014
>>> (r264794)
>>> @@ -21,6 +21,7 @@ CHROOTDIR="/scratch"
>>> EMBEDDEDBUILD=1
>>> XDEV="arm"
>>> XDEV_ARCH="armv6"
>>> +XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
>>> KERNEL="ZEDBOARD"
>>> CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
>>> CROCHETBRANCH="trunk"
>>>
>>> Modified: head/release/arm/release.sh
>>> ==
>>> --- head/release/arm/release.sh Wed Apr 23 01:47:07 2014
>>> (r264793)
>>> +++ head/release/arm/release.sh Wed Apr 23 02:01:22 2014
>>> (r264794)
>>> @@ -94,8 +94,7 @@ install_uboot() {
>>> main() {
>>> # Build the 'xdev' target for crochet.
>>> eval chroot ${CHROOTDIR} make -C /usr/src \
>>> - WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1 \
>>> - XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
>>> + ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
>>> ${WORLD_FLAGS} xdev
>>>
>>> # Run the ldconfig(8) startup s
Re: svn commit: r264794 - head/release/arm
On Apr 22, 2014, at 10:12 PM, Glen Barber wrote:
> On Wed, Apr 23, 2014 at 01:09:23AM -0400, Glen Barber wrote:
>> On Tue, Apr 22, 2014 at 10:02:03PM -0700, Warner Losh wrote:
>>> Ditto. This should be backed out and you should make whoever broke this fix
>>> it in head.
>>>
>>
>> Well, this commit only moves where the definition is, from the script
>> itself to the configuration file.
>>
>> But, to be fair, I think you broke it in r264660.
>>
>
> To clarify further, if it was you that did break it in head/, I am not
> complaining about it - I fixed the use case I need.
>
> What I *want* to happen is for the WITH_CLANG_IS_CC and
> WITHOUT_CLANG_IS_CC to stop conflicting with WITH_GCC, and additional
> convoluted and unnecessary knobs to go away.
>
> But you already know that. :)
Yea, see my recent posts to arm@ on that very topic. CLANG_IS_CC is evil and
must die. There’s too many stupid special cases for clang in the build system,
and it is really horking me off… But there will be fewer in about a week or so
when I push my next round of fixes in...
Warner
> Glen
>
>> Glen
>>
>>> Warner
>>>
>>> On Apr 22, 2014, at 7:01 PM, Glen Barber wrote:
>>>
Author: gjb
Date: Wed Apr 23 02:01:22 2014
New Revision: 264794
URL: http://svnweb.freebsd.org/changeset/base/264794
Log:
Move xdev knobs from release/arm/release.sh and into an
XDEV_FLAGS variable in ${KERNCONF}.conf file.
MFC after: 3 days
X-MFC-Note:fix stable/10 XDEV_FLAGS local for branch
Sponsored by: The FreeBSD Foundation
Modified:
head/release/arm/BEAGLEBONE.conf
head/release/arm/PANDABOARD.conf
head/release/arm/RPI-B.conf
head/release/arm/WANDBOARD-QUAD.conf
head/release/arm/ZEDBOARD.conf
head/release/arm/release.sh
Modified: head/release/arm/BEAGLEBONE.conf
==
--- head/release/arm/BEAGLEBONE.conf Wed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/BEAGLEBONE.conf Wed Apr 23 02:01:22 2014
(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="BEAGLEBONE"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/PANDABOARD.conf
==
--- head/release/arm/PANDABOARD.conf Wed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/PANDABOARD.conf Wed Apr 23 02:01:22 2014
(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="PANDABOARD"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/RPI-B.conf
==
--- head/release/arm/RPI-B.confWed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/RPI-B.confWed Apr 23 02:01:22 2014
(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="RPI-B"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/WANDBOARD-QUAD.conf
==
--- head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/WANDBOARD-QUAD.conf Wed Apr 23 02:01:22 2014
(r264794)
@@ -22,6 +22,7 @@ EMBEDDEDBUILD=1
EMBEDDEDPORTS="lang/python textproc/gsed"
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="WANDBOARD-QUAD"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
Modified: head/release/arm/ZEDBOARD.conf
==
--- head/release/arm/ZEDBOARD.conf Wed Apr 23 01:47:07 2014
(r264793)
+++ head/release/arm/ZEDBOARD.conf Wed Apr 23 02:01:22 2014
(r264794)
@@ -21,6 +21,7 @@ CHROOTDIR="/scratch"
EMBEDDEDBUILD=1
XDEV="arm"
XDEV_ARCH="armv6"
+XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
KERNEL="ZEDBOARD"
CROCHETSRC="https://github.com/kientzle/crochet-freebsd";
CROCHETBRANCH="trunk"
>>
Re: svn commit: r264794 - head/release/arm
On Tue, Apr 22, 2014 at 10:15:14PM -0700, Warner Losh wrote: > > On Apr 22, 2014, at 10:12 PM, Glen Barber wrote: > > > On Wed, Apr 23, 2014 at 01:09:23AM -0400, Glen Barber wrote: > >> On Tue, Apr 22, 2014 at 10:02:03PM -0700, Warner Losh wrote: > >>> Ditto. This should be backed out and you should make whoever broke this > >>> fix it in head. > >>> > >> > >> Well, this commit only moves where the definition is, from the script > >> itself to the configuration file. > >> > >> But, to be fair, I think you broke it in r264660. > >> > > > > To clarify further, if it was you that did break it in head/, I am not > > complaining about it - I fixed the use case I need. > > > > What I *want* to happen is for the WITH_CLANG_IS_CC and > > WITHOUT_CLANG_IS_CC to stop conflicting with WITH_GCC, and additional > > convoluted and unnecessary knobs to go away. > > > > But you already know that. :) > > Yea, see my recent posts to arm@ on that very topic. CLANG_IS_CC > is evil and must die. There’s too many stupid special cases for > clang in the build system, and it is really horking me off… But > there will be fewer in about a week or so when I push my next round > of fixes in... > Feel free to run your changes by me for testing. I'm happy to complain^W test. :) Glen pgpt_RYm8mO0D.pgp Description: PGP signature
Re: svn commit: r264794 - head/release/arm
On Apr 22, 2014, at 10:17 PM, Glen Barber wrote: > On Tue, Apr 22, 2014 at 10:15:14PM -0700, Warner Losh wrote: >> >> On Apr 22, 2014, at 10:12 PM, Glen Barber wrote: >> >>> On Wed, Apr 23, 2014 at 01:09:23AM -0400, Glen Barber wrote: On Tue, Apr 22, 2014 at 10:02:03PM -0700, Warner Losh wrote: > Ditto. This should be backed out and you should make whoever broke this > fix it in head. > Well, this commit only moves where the definition is, from the script itself to the configuration file. But, to be fair, I think you broke it in r264660. >>> >>> To clarify further, if it was you that did break it in head/, I am not >>> complaining about it - I fixed the use case I need. >>> >>> What I *want* to happen is for the WITH_CLANG_IS_CC and >>> WITHOUT_CLANG_IS_CC to stop conflicting with WITH_GCC, and additional >>> convoluted and unnecessary knobs to go away. >>> >>> But you already know that. :) >> >> Yea, see my recent posts to arm@ on that very topic. CLANG_IS_CC >> is evil and must die. There’s too many stupid special cases for >> clang in the build system, and it is really horking me off… But >> there will be fewer in about a week or so when I push my next round >> of fixes in... >> > > Feel free to run your changes by me for testing. I'm happy to > complain^W test. :) Will do… My work in progress mercurial patch queue is updating every day or three at http://people.freebsd.org/~imp/patch-queue if you wanted a sneak peak and had a mercurial setup already… But there’s also some crazy stuff in that… When I have a patch set I’m ready to dump into make universe, I’ll give you a heads up. And sorry for breaking it in the first place... Warner ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264798 - head/sys/dev/ath
Author: adrian Date: Wed Apr 23 05:19:45 2014 New Revision: 264798 URL: http://svnweb.freebsd.org/changeset/base/264798 Log: Wrap the rate control re-init code in a lock, to serialise it with concurrent updates from any completing transmits in other threads. This was exposed when doing power save work - net80211 is constantly doing reassociations and it's causing the rate control state to get blanked out. This could cause the rate control code to assert. This should be MFCed to stable/10 as it's a stability fix. Tested: * AR5416, STA MFC after:7 days Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c == --- head/sys/dev/ath/if_ath.c Wed Apr 23 03:30:00 2014(r264797) +++ head/sys/dev/ath/if_ath.c Wed Apr 23 05:19:45 2014(r264798) @@ -5567,7 +5567,9 @@ ath_newassoc(struct ieee80211_node *ni, an->an_mcastrix = ath_tx_findrix(sc, tp->mcastrate); an->an_mgmtrix = ath_tx_findrix(sc, tp->mgmtrate); + ATH_NODE_LOCK(an); ath_rate_newassoc(sc, an, isnew); + ATH_NODE_UNLOCK(an); if (isnew && (vap->iv_flags & IEEE80211_F_PRIVACY) == 0 && sc->sc_hasclrkey && ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264800 - head/sys/dev/usb/serial
Author: hselasky
Date: Wed Apr 23 05:50:55 2014
New Revision: 264800
URL: http://svnweb.freebsd.org/changeset/base/264800
Log:
- Get transmit loop more in line with the other serial drivers.
- Add a comment about FTDI and ZLPs.
- Correctly check odditiy of baud rate divisor.
- Correct IOCTL handling for "error" and "event" char.
MFC after:1 weeks
Modified:
head/sys/dev/usb/serial/uftdi.c
Modified: head/sys/dev/usb/serial/uftdi.c
==
--- head/sys/dev/usb/serial/uftdi.c Wed Apr 23 05:29:50 2014
(r264799)
+++ head/sys/dev/usb/serial/uftdi.c Wed Apr 23 05:50:55 2014
(r264800)
@@ -1155,11 +1155,17 @@ uftdi_write_callback(struct usb_xfer *xf
* Otherwise, loop to format packets into the buffer while there
* is data available, and room for a packet header and at least
* one byte of payload.
+*
+* NOTE: The FTDI chip doesn't accept zero length
+* packets. This cannot happen because the "pktlen"
+* will always be non-zero when "ucom_get_data()"
+* returns non-zero which we check below.
*/
pc = usbd_xfer_get_frame(xfer, 0);
if (sc->sc_hdrlen == 0) {
- ucom_get_data(&sc->sc_ucom, pc, 0, UFTDI_OBUFSIZE,
- &buflen);
+ if (ucom_get_data(&sc->sc_ucom, pc, 0, UFTDI_OBUFSIZE,
+ &buflen) == 0)
+ break;
} else {
buflen = 0;
while (buflen < UFTDI_OBUFSIZE - sc->sc_hdrlen - 1 &&
@@ -1417,7 +1423,7 @@ uftdi_encode_baudrate(struct uftdi_softc
* 8ths by adding 1 and dividing by 2.
*/
divisor = (clk << 4) / speed;
- if ((divisor & 0xfff0) == 1)
+ if ((divisor & 0xf) == 1)
divisor &= 0xfff8;
else if (sc->sc_devtype == DEVT_232A)
divisor += roundoff_232a[divisor & 0x0f];
@@ -1759,10 +1765,11 @@ uftdi_ioctl(struct ucom_softc *ucom, uin
err = uftdi_get_latency(ucom, (int *)data);
break;
case UFTDIIOC_SET_ERROR_CHAR:
- err = uftdi_set_event_char(ucom, *(int *)data);
+ err = uftdi_set_error_char(ucom, *(int *)data);
break;
case UFTDIIOC_SET_EVENT_CHAR:
- err = uftdi_set_error_char(ucom, *(int *)data);
+ err = uftdi_set_event_char(ucom, *(int *)data);
+ break;
case UFTDIIOC_GET_HWREV:
*(int *)data = sc->sc_bcdDevice;
err = 0;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264801 - head/sys/dev/usb/serial
Author: kevlo Date: Wed Apr 23 05:53:03 2014 New Revision: 264801 URL: http://svnweb.freebsd.org/changeset/base/264801 Log: Add a missing break. Modified: head/sys/dev/usb/serial/uftdi.c Modified: head/sys/dev/usb/serial/uftdi.c == --- head/sys/dev/usb/serial/uftdi.c Wed Apr 23 05:50:55 2014 (r264800) +++ head/sys/dev/usb/serial/uftdi.c Wed Apr 23 05:53:03 2014 (r264801) @@ -1770,6 +1770,7 @@ uftdi_ioctl(struct ucom_softc *ucom, uin case UFTDIIOC_SET_EVENT_CHAR: err = uftdi_set_event_char(ucom, *(int *)data); break; + break; case UFTDIIOC_GET_HWREV: *(int *)data = sc->sc_bcdDevice; err = 0; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264802 - head/sys/dev/usb/serial
Author: kevlo Date: Wed Apr 23 05:54:55 2014 New Revision: 264802 URL: http://svnweb.freebsd.org/changeset/base/264802 Log: Oops, revert r264801. Modified: head/sys/dev/usb/serial/uftdi.c Modified: head/sys/dev/usb/serial/uftdi.c == --- head/sys/dev/usb/serial/uftdi.c Wed Apr 23 05:53:03 2014 (r264801) +++ head/sys/dev/usb/serial/uftdi.c Wed Apr 23 05:54:55 2014 (r264802) @@ -1770,7 +1770,6 @@ uftdi_ioctl(struct ucom_softc *ucom, uin case UFTDIIOC_SET_EVENT_CHAR: err = uftdi_set_event_char(ucom, *(int *)data); break; - break; case UFTDIIOC_GET_HWREV: *(int *)data = sc->sc_bcdDevice; err = 0; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
