svn commit: r277107 - in projects/ifnet: share/man/man7 sys/cam/ata sys/cam/scsi sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/dev/ahci sys/dev/cxgbe/iw_cxgbe sys/dev/fdt sys/dev/mii sys/dev/o...
Gleb Smirnoff
glebius at FreeBSD.org
Tue Jan 13 06:27:08 UTC 2015
Author: glebius
Date: Tue Jan 13 06:27:02 2015
New Revision: 277107
URL: https://svnweb.freebsd.org/changeset/base/277107
Log:
Merge head up to r277106.
Modified:
projects/ifnet/share/man/man7/crypto.7
projects/ifnet/sys/cam/ata/ata_da.c
projects/ifnet/sys/cam/scsi/scsi_da.c
projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
projects/ifnet/sys/dev/ahci/ahci.h
projects/ifnet/sys/dev/ahci/ahci_pci.c
projects/ifnet/sys/dev/cxgbe/iw_cxgbe/cm.c
projects/ifnet/sys/dev/fdt/simplebus.c
projects/ifnet/sys/dev/mii/e1000phy.c
projects/ifnet/sys/dev/mii/miivar.h
projects/ifnet/sys/dev/ofw/ofw_bus_subr.c
projects/ifnet/sys/dev/ofw/ofw_bus_subr.h
projects/ifnet/sys/dev/ofw/ofwbus.c
projects/ifnet/sys/dev/xen/netback/netback.c
projects/ifnet/sys/dev/xen/netfront/netfront.c
projects/ifnet/usr.bin/sed/process.c
Directory Properties:
projects/ifnet/ (props changed)
projects/ifnet/share/ (props changed)
projects/ifnet/sys/ (props changed)
projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed)
Modified: projects/ifnet/share/man/man7/crypto.7
==============================================================================
--- projects/ifnet/share/man/man7/crypto.7 Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/share/man/man7/crypto.7 Tue Jan 13 06:27:02 2015 (r277107)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 12, 2014
+.Dd January 2, 2015
.Dt CRYPTO 7
.Os
.Sh NAME
@@ -105,7 +105,7 @@ Note: You must provide an IV on every ca
.It Dv CRYPTO_AES_XTS
.Bl -tag -width "Block size :" -compact -offset indent
.It IV size :
-16
+8
.It Block size :
16
.It Key size :
Modified: projects/ifnet/sys/cam/ata/ata_da.c
==============================================================================
--- projects/ifnet/sys/cam/ata/ata_da.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/cam/ata/ata_da.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -1790,6 +1790,16 @@ adadone(struct cam_periph *periph, union
TAILQ_INIT(&queue);
TAILQ_CONCAT(&queue, &softc->trim_req.bps, bio_queue);
+ /*
+ * Normally, the xpt_release_ccb() above would make sure
+ * that when we have more work to do, that work would
+ * get kicked off. However, we specifically keep
+ * trim_running set to 0 before the call above to allow
+ * other I/O to progress when many BIO_DELETE requests
+ * are pushed down. We set trim_running to 0 and call
+ * daschedule again so that we don't stall if there are
+ * no other I/Os pending apart from BIO_DELETEs.
+ */
softc->trim_running = 0;
adaschedule(periph);
cam_periph_unlock(periph);
Modified: projects/ifnet/sys/cam/scsi/scsi_da.c
==============================================================================
--- projects/ifnet/sys/cam/scsi/scsi_da.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/cam/scsi/scsi_da.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -3018,6 +3018,16 @@ dadone(struct cam_periph *periph, union
TAILQ_INIT(&queue);
TAILQ_CONCAT(&queue, &softc->delete_run_queue.queue, bio_queue);
softc->delete_run_queue.insert_point = NULL;
+ /*
+ * Normally, the xpt_release_ccb() above would make sure
+ * that when we have more work to do, that work would
+ * get kicked off. However, we specifically keep
+ * delete_running set to 0 before the call above to
+ * allow other I/O to progress when many BIO_DELETE
+ * requests are pushed down. We set delete_running to 0
+ * and call daschedule again so that we don't stall if
+ * there are no other I/Os pending apart from BIO_DELETEs.
+ */
softc->delete_running = 0;
daschedule(periph);
cam_periph_unlock(periph);
Modified: projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
==============================================================================
--- projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -435,7 +435,8 @@ vdev_mirror_io_start(zio_t *zio)
mm = vdev_mirror_map_init(zio);
if (zio->io_type == ZIO_TYPE_READ) {
- if ((zio->io_flags & ZIO_FLAG_SCRUB) && !mm->mm_replacing) {
+ if ((zio->io_flags & ZIO_FLAG_SCRUB) && !mm->mm_replacing &&
+ mm->mm_children > 1) {
/*
* For scrubbing reads we need to allocate a read
* buffer for each child and issue reads to all
Modified: projects/ifnet/sys/dev/ahci/ahci.h
==============================================================================
--- projects/ifnet/sys/dev/ahci/ahci.h Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/ahci/ahci.h Tue Jan 13 06:27:02 2015 (r277107)
@@ -572,6 +572,7 @@ enum ahci_err_type {
#define AHCI_Q_ATI_PMP_BUG 0x2000
#define AHCI_Q_MAXIO_64K 0x4000
#define AHCI_Q_SATA1_UNIT0 0x8000 /* need better method for this */
+#define AHCI_Q_ABAR0 0x10000
#define AHCI_Q_BIT_STRING \
"\020" \
Modified: projects/ifnet/sys/dev/ahci/ahci_pci.c
==============================================================================
--- projects/ifnet/sys/dev/ahci/ahci_pci.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/ahci/ahci_pci.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -287,6 +287,7 @@ static const struct {
{0x11841039, 0x00, "SiS 966", 0},
{0x11851039, 0x00, "SiS 968", 0},
{0x01861039, 0x00, "SiS 968", 0},
+ {0xa01c177d, 0x00, "ThunderX SATA", AHCI_Q_ABAR0},
{0x00000000, 0x00, NULL, 0}
};
@@ -386,12 +387,16 @@ ahci_pci_attach(device_t dev)
pci_get_subvendor(dev) == 0x1043 &&
pci_get_subdevice(dev) == 0x81e4)
ctlr->quirks |= AHCI_Q_SATA1_UNIT0;
- /* if we have a memory BAR(5) we are likely on an AHCI part */
ctlr->vendorid = pci_get_vendor(dev);
ctlr->deviceid = pci_get_device(dev);
ctlr->subvendorid = pci_get_subvendor(dev);
ctlr->subdeviceid = pci_get_subdevice(dev);
- ctlr->r_rid = PCIR_BAR(5);
+
+ /* Default AHCI Base Address is BAR(5), Cavium uses BAR(0) */
+ if (ctlr->quirks & AHCI_Q_ABAR0)
+ ctlr->r_rid = PCIR_BAR(0);
+ else
+ ctlr->r_rid = PCIR_BAR(5);
if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
&ctlr->r_rid, RF_ACTIVE)))
return ENXIO;
Modified: projects/ifnet/sys/dev/cxgbe/iw_cxgbe/cm.c
==============================================================================
--- projects/ifnet/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -955,18 +955,14 @@ send_mpa_req(struct c4iw_ep *ep)
if (mpa_rev_to_use == 2)
mpalen += sizeof(struct mpa_v2_conn_params);
- if (mpalen > MHLEN)
- CXGBE_UNIMPLEMENTED(__func__);
-
- m = m_gethdr(M_NOWAIT, MT_DATA);
- if (m == NULL) {
+ mpa = malloc(mpalen, M_CXGBE, M_NOWAIT);
+ if (mpa == NULL) {
+failed:
connect_reply_upcall(ep, -ENOMEM);
return;
}
- mpa = mtod(m, struct mpa_message *);
- m->m_len = mpalen;
- m->m_pkthdr.len = mpalen;
+ memset(mpa, 0, mpalen);
memcpy(mpa->key, MPA_KEY_REQ, sizeof(mpa->key));
mpa->flags = (crc_enabled ? MPA_CRC : 0) |
(markers_enabled ? MPA_MARKERS : 0) |
@@ -1013,11 +1009,18 @@ send_mpa_req(struct c4iw_ep *ep)
CTR2(KTR_IW_CXGBE, "%s:smr7 %p", __func__, ep);
}
- err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, ep->com.thread);
- if (err) {
- connect_reply_upcall(ep, -ENOMEM);
- return;
+ m = m_getm(NULL, mpalen, M_NOWAIT, MT_DATA);
+ if (m == NULL) {
+ free(mpa, M_CXGBE);
+ goto failed;
}
+ m_copyback(m, 0, mpalen, (void *)mpa);
+ free(mpa, M_CXGBE);
+
+ err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT,
+ ep->com.thread);
+ if (err)
+ goto failed;
START_EP_TIMER(ep);
state_set(&ep->com, MPA_REQ_SENT);
@@ -1044,22 +1047,11 @@ static int send_mpa_reject(struct c4iw_e
ep->mpa_attr.version, mpalen);
}
- if (mpalen > MHLEN)
- CXGBE_UNIMPLEMENTED(__func__);
-
- m = m_gethdr(M_NOWAIT, MT_DATA);
- if (m == NULL) {
-
- printf("%s - cannot alloc mbuf!\n", __func__);
- CTR2(KTR_IW_CXGBE, "%s:smrej2 %p", __func__, ep);
+ mpa = malloc(mpalen, M_CXGBE, M_NOWAIT);
+ if (mpa == NULL)
return (-ENOMEM);
- }
-
- mpa = mtod(m, struct mpa_message *);
- m->m_len = mpalen;
- m->m_pkthdr.len = mpalen;
- memset(mpa, 0, sizeof(*mpa));
+ memset(mpa, 0, mpalen);
memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key));
mpa->flags = MPA_REJECT;
mpa->revision = mpa_rev;
@@ -1091,7 +1083,15 @@ static int send_mpa_reject(struct c4iw_e
if (plen)
memcpy(mpa->private_data, pdata, plen);
- err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, ep->com.thread);
+ m = m_getm(NULL, mpalen, M_NOWAIT, MT_DATA);
+ if (m == NULL) {
+ free(mpa, M_CXGBE);
+ return (-ENOMEM);
+ }
+ m_copyback(m, 0, mpalen, (void *)mpa);
+ free(mpa, M_CXGBE);
+
+ err = -sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, ep->com.thread);
if (!err)
ep->snd_seq += mpalen;
CTR4(KTR_IW_CXGBE, "%s:smrejE %p %u %d", __func__, ep, ep->hwtid, err);
@@ -1117,21 +1117,10 @@ static int send_mpa_reply(struct c4iw_ep
mpalen += sizeof(struct mpa_v2_conn_params);
}
- if (mpalen > MHLEN)
- CXGBE_UNIMPLEMENTED(__func__);
-
- m = m_gethdr(M_NOWAIT, MT_DATA);
- if (m == NULL) {
-
- CTR2(KTR_IW_CXGBE, "%s:smrep2 %p", __func__, ep);
- printf("%s - cannot alloc mbuf!\n", __func__);
+ mpa = malloc(mpalen, M_CXGBE, M_NOWAIT);
+ if (mpa == NULL)
return (-ENOMEM);
- }
-
- mpa = mtod(m, struct mpa_message *);
- m->m_len = mpalen;
- m->m_pkthdr.len = mpalen;
memset(mpa, 0, sizeof(*mpa));
memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key));
mpa->flags = (ep->mpa_attr.crc_enabled ? MPA_CRC : 0) |
@@ -1182,9 +1171,18 @@ static int send_mpa_reply(struct c4iw_ep
if (plen)
memcpy(mpa->private_data, pdata, plen);
+ m = m_getm(NULL, mpalen, M_NOWAIT, MT_DATA);
+ if (m == NULL) {
+ free(mpa, M_CXGBE);
+ return (-ENOMEM);
+ }
+ m_copyback(m, 0, mpalen, (void *)mpa);
+ free(mpa, M_CXGBE);
+
+
state_set(&ep->com, MPA_REP_SENT);
ep->snd_seq += mpalen;
- err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT,
+ err = -sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT,
ep->com.thread);
CTR3(KTR_IW_CXGBE, "%s:smrepE %p %d", __func__, ep, err);
return err;
Modified: projects/ifnet/sys/dev/fdt/simplebus.c
==============================================================================
--- projects/ifnet/sys/dev/fdt/simplebus.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/fdt/simplebus.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -253,10 +253,6 @@ simplebus_setup_dinfo(device_t dev, phan
{
struct simplebus_softc *sc;
struct simplebus_devinfo *ndi;
- uint32_t *reg;
- uint64_t phys, size;
- int i, j, k;
- int nreg;
sc = device_get_softc(dev);
@@ -267,32 +263,7 @@ simplebus_setup_dinfo(device_t dev, phan
}
resource_list_init(&ndi->rl);
- nreg = OF_getencprop_alloc(node, "reg", sizeof(*reg), (void **)®);
- if (nreg == -1)
- nreg = 0;
- if (nreg % (sc->acells + sc->scells) != 0) {
- if (bootverbose)
- device_printf(dev, "Malformed reg property on <%s>\n",
- ndi->obdinfo.obd_name);
- nreg = 0;
- }
-
- for (i = 0, k = 0; i < nreg; i += sc->acells + sc->scells, k++) {
- phys = size = 0;
- for (j = 0; j < sc->acells; j++) {
- phys <<= 32;
- phys |= reg[i + j];
- }
- for (j = 0; j < sc->scells; j++) {
- size <<= 32;
- size |= reg[i + sc->acells + j];
- }
-
- resource_list_add(&ndi->rl, SYS_RES_MEMORY, k,
- phys, phys + size - 1, size);
- }
- free(reg, M_OFWPROP);
-
+ ofw_bus_reg_to_rl(dev, node, sc->acells, sc->scells, &ndi->rl);
ofw_bus_intr_to_rl(dev, node, &ndi->rl);
return (ndi);
Modified: projects/ifnet/sys/dev/mii/e1000phy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/e1000phy.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/mii/e1000phy.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -131,14 +131,13 @@ static int
e1000phy_attach(device_t dev)
{
struct mii_softc *sc;
- if_t ifp;
sc = device_get_softc(dev);
mii_phy_dev_attach(dev, MIIF_NOMANPAUSE, &e1000phy_funcs, 0);
- ifp = sc->mii_pdata->mii_ifp;
- if (mii_dev_mac_match(dev, "msk") && (sc->mii_flags & MIIF_MACPRIV0) != 0)
+ if (mii_dev_mac_match(dev, "msk") &&
+ (sc->mii_flags & MIIF_MACPRIV0) != 0)
sc->mii_flags |= MIIF_PHYPRIV0;
switch (sc->mii_mpd_model) {
Modified: projects/ifnet/sys/dev/mii/miivar.h
==============================================================================
--- projects/ifnet/sys/dev/mii/miivar.h Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/mii/miivar.h Tue Jan 13 06:27:02 2015 (r277107)
@@ -45,13 +45,6 @@
struct mii_softc;
/*
- * Callbacks from MII layer into network interface device driver.
- */
-typedef int (*mii_readreg_t)(struct device *, int, int);
-typedef void (*mii_writereg_t)(struct device *, int, int, int);
-typedef void (*mii_statchg_t)(struct device *);
-
-/*
* A network interface driver has one of these structures in its softc.
* It is the interface from the network interface driver to the MII
* layer.
@@ -73,13 +66,6 @@ struct mii_data {
*/
u_int mii_media_status;
u_int mii_media_active;
-
- /*
- * Calls from MII layer into network interface driver.
- */
- mii_readreg_t mii_readreg;
- mii_writereg_t mii_writereg;
- mii_statchg_t mii_statchg;
};
typedef struct mii_data mii_data_t;
Modified: projects/ifnet/sys/dev/ofw/ofw_bus_subr.c
==============================================================================
--- projects/ifnet/sys/dev/ofw/ofw_bus_subr.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/ofw/ofw_bus_subr.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -370,6 +370,54 @@ ofw_bus_search_intrmap(void *intr, int i
}
int
+ofw_bus_reg_to_rl(device_t dev, phandle_t node, pcell_t acells, pcell_t scells,
+ struct resource_list *rl)
+{
+ uint64_t phys, size;
+ ssize_t i, j, rid, nreg, ret;
+ uint32_t *reg;
+ char *name;
+
+ /*
+ * This may be just redundant when having ofw_bus_devinfo
+ * but makes this routine independent of it.
+ */
+ ret = OF_getencprop_alloc(node, "name", sizeof(*name), (void **)&name);
+ if (ret == -1)
+ name = NULL;
+
+ ret = OF_getencprop_alloc(node, "reg", sizeof(*reg), (void **)®);
+ nreg = (ret == -1) ? 0 : ret;
+
+ if (nreg % (acells + scells) != 0) {
+ if (bootverbose)
+ device_printf(dev, "Malformed reg property on <%s>\n",
+ (name == NULL) ? "unknown" : name);
+ nreg = 0;
+ }
+
+ for (i = 0, rid = 0; i < nreg; i += acells + scells, rid++) {
+ phys = size = 0;
+ for (j = 0; j < acells; j++) {
+ phys <<= 32;
+ phys |= reg[i + j];
+ }
+ for (j = 0; j < scells; j++) {
+ size <<= 32;
+ size |= reg[i + acells + j];
+ }
+ /* Skip the dummy reg property of glue devices like ssm(4). */
+ if (size != 0)
+ resource_list_add(rl, SYS_RES_MEMORY, rid,
+ phys, phys + size - 1, size);
+ }
+ free(name, M_OFWPROP);
+ free(reg, M_OFWPROP);
+
+ return (0);
+}
+
+int
ofw_bus_intr_to_rl(device_t dev, phandle_t node, struct resource_list *rl)
{
phandle_t iparent;
Modified: projects/ifnet/sys/dev/ofw/ofw_bus_subr.h
==============================================================================
--- projects/ifnet/sys/dev/ofw/ofw_bus_subr.h Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/ofw/ofw_bus_subr.h Tue Jan 13 06:27:02 2015 (r277107)
@@ -73,6 +73,8 @@ int ofw_bus_search_intrmap(void *, int,
void *, void *, int, phandle_t *);
/* Routines for parsing device-tree data into resource lists. */
+int ofw_bus_reg_to_rl(device_t, phandle_t, pcell_t, pcell_t,
+ struct resource_list *);
int ofw_bus_intr_to_rl(device_t, phandle_t, struct resource_list *);
/* Helper to get device status property */
Modified: projects/ifnet/sys/dev/ofw/ofwbus.c
==============================================================================
--- projects/ifnet/sys/dev/ofw/ofwbus.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/ofw/ofwbus.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -442,10 +442,6 @@ ofwbus_setup_dinfo(device_t dev, phandle
struct ofwbus_softc *sc;
struct ofwbus_devinfo *ndi;
const char *nodename;
- uint32_t *reg;
- uint64_t phys, size;
- int i, j, rid;
- int nreg;
sc = device_get_softc(dev);
@@ -462,33 +458,7 @@ ofwbus_setup_dinfo(device_t dev, phandle
}
resource_list_init(&ndi->ndi_rl);
- nreg = OF_getencprop_alloc(node, "reg", sizeof(*reg), (void **)®);
- if (nreg == -1)
- nreg = 0;
- if (nreg % (sc->acells + sc->scells) != 0) {
- if (bootverbose)
- device_printf(dev, "Malformed reg property on <%s>\n",
- nodename);
- nreg = 0;
- }
-
- for (i = 0, rid = 0; i < nreg; i += sc->acells + sc->scells, rid++) {
- phys = size = 0;
- for (j = 0; j < sc->acells; j++) {
- phys <<= 32;
- phys |= reg[i + j];
- }
- for (j = 0; j < sc->scells; j++) {
- size <<= 32;
- size |= reg[i + sc->acells + j];
- }
- /* Skip the dummy reg property of glue devices like ssm(4). */
- if (size != 0)
- resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, rid,
- phys, phys + size - 1, size);
- }
- free(reg, M_OFWPROP);
-
+ ofw_bus_reg_to_rl(dev, node, sc->acells, sc->scells, &ndi->ndi_rl);
ofw_bus_intr_to_rl(dev, node, &ndi->ndi_rl);
return (ndi);
Modified: projects/ifnet/sys/dev/xen/netback/netback.c
==============================================================================
--- projects/ifnet/sys/dev/xen/netback/netback.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/xen/netback/netback.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -2251,7 +2251,6 @@ xnb_ioctl(struct ifnet *ifp, u_long cmd,
mtx_unlock(&xnb->sc_lock);
break;
case SIOCSIFADDR:
- case SIOCGIFADDR:
#ifdef INET
mtx_lock(&xnb->sc_lock);
if (ifa->ifa_addr->sa_family == AF_INET) {
Modified: projects/ifnet/sys/dev/xen/netfront/netfront.c
==============================================================================
--- projects/ifnet/sys/dev/xen/netfront/netfront.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/sys/dev/xen/netfront/netfront.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -1741,7 +1741,6 @@ xn_ioctl(struct ifnet *ifp, u_long cmd,
int mask, error = 0;
switch(cmd) {
case SIOCSIFADDR:
- case SIOCGIFADDR:
#ifdef INET
XN_LOCK(sc);
if (ifa->ifa_addr->sa_family == AF_INET) {
Modified: projects/ifnet/usr.bin/sed/process.c
==============================================================================
--- projects/ifnet/usr.bin/sed/process.c Tue Jan 13 06:23:38 2015 (r277106)
+++ projects/ifnet/usr.bin/sed/process.c Tue Jan 13 06:27:02 2015 (r277107)
@@ -67,7 +67,7 @@ static SPACE HS, PS, SS, YS;
#define hs HS.space
#define hsl HS.len
-static __inline int applies(struct s_command *);
+static inline int applies(struct s_command *);
static void do_tr(struct s_tr *);
static void flush_appends(void);
static void lputs(char *, size_t);
@@ -288,7 +288,7 @@ new: if (!nflag && !pd)
* Return TRUE if the command applies to the current line. Sets the start
* line for process ranges. Interprets the non-select (``!'') flag.
*/
-static __inline int
+static inline int
applies(struct s_command *cp)
{
int r;
More information about the svn-src-projects
mailing list