svn commit: r206029 - head/sys/cam/scsi
Author: mjacob Date: Thu Apr 1 01:49:43 2010 New Revision: 206029 URL: http://svn.freebsd.org/changeset/base/206029 Log: Add a couple missing basic mode page codes. MFC after:1 week Modified: head/sys/cam/scsi/scsi_all.h Modified: head/sys/cam/scsi/scsi_all.h == --- head/sys/cam/scsi/scsi_all.hThu Apr 1 01:27:10 2010 (r206028) +++ head/sys/cam/scsi/scsi_all.hThu Apr 1 01:49:43 2010 (r206029) @@ -170,6 +170,8 @@ struct scsi_mode_sense_6 #defineSMS_PAGE_CODE 0x3F #define SMS_VENDOR_SPECIFIC_PAGE 0x00 #define SMS_DISCONNECT_RECONNECT_PAGE 0x02 +#define SMS_FORMAT_DEVICE_PAGE 0x03 +#define SMS_GEOMETRY_PAGE 0x04 #define SMS_CACHE_PAGE 0x08 #define SMS_PERIPHERAL_DEVICE_PAGE 0x09 #define SMS_CONTROL_MODE_PAGE 0x0A ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206028 - head/sys/kern
Author: lstewart
Date: Thu Apr 1 01:27:10 2010
New Revision: 206028
URL: http://svn.freebsd.org/changeset/base/206028
Log:
The ALQ should not be considered drained until it has been made inactive.
Sponsored by: FreeBSD Foundation
Reviewed by: dwmalone, jeff, rpaulo, rwatson (as part of a larger patch)
Approved by: kmacy (mentor)
MFC after:1 month
Modified:
head/sys/kern/kern_alq.c
Modified: head/sys/kern/kern_alq.c
==
--- head/sys/kern/kern_alq.cThu Apr 1 01:23:36 2010(r206027)
+++ head/sys/kern/kern_alq.cThu Apr 1 01:27:10 2010(r206028)
@@ -253,7 +253,7 @@ alq_shutdown(struct alq *alq)
alq->aq_flags |= AQ_SHUTDOWN;
/* Drain IO */
- while (alq->aq_flags & (AQ_FLUSHING|AQ_ACTIVE)) {
+ while (alq->aq_flags & AQ_ACTIVE) {
alq->aq_flags |= AQ_WANTED;
msleep_spin(alq, &alq->aq_mtx, "aldclose", 0);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206027 - head/sys/kern
Author: lstewart
Date: Thu Apr 1 01:23:36 2010
New Revision: 206027
URL: http://svn.freebsd.org/changeset/base/206027
Log:
According to SLEEP(9), msleep() is deprecated in favour of mtx_sleep().
Sponsored by: FreeBSD Foundation
Reviewed by: dwmalone, jeff, rpaulo, rwatson (as part of a larger patch)
Approved by: kmacy (mentor)
MFC after:1 month
Modified:
head/sys/kern/kern_alq.c
Modified: head/sys/kern/kern_alq.c
==
--- head/sys/kern/kern_alq.cThu Apr 1 01:16:00 2010(r206026)
+++ head/sys/kern/kern_alq.cThu Apr 1 01:23:36 2010(r206027)
@@ -191,7 +191,7 @@ ald_daemon(void)
for (;;) {
while ((alq = LIST_FIRST(&ald_active)) == NULL &&
!ald_shutingdown)
- msleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
+ mtx_sleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
/* Don't shutdown until all active ALQs are flushed. */
if (ald_shutingdown && alq == NULL) {
@@ -234,12 +234,12 @@ ald_shutdown(void *arg, int howto)
/*
* Wake ald_daemon so that it exits. It won't be able to do
-* anything until we msleep because we hold the ald_mtx.
+* anything until we mtx_sleep because we hold the ald_mtx.
*/
wakeup(&ald_active);
/* Wait for ald_daemon to exit. */
- msleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0);
+ mtx_sleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0);
ALD_UNLOCK();
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206026 - head/sys/kern
Author: lstewart
Date: Thu Apr 1 01:16:00 2010
New Revision: 206026
URL: http://svn.freebsd.org/changeset/base/206026
Log:
- Factor code to destroy an ALQ out of alq_close() into a private
alq_destroy().
- Use the new alq_destroy() to properly handle a failure case in alq_open().
Sponsored by: FreeBSD Foundation
Reviewed by: dwmalone, jeff, rpaulo, rwatson (as part of a larger patch)
Approved by: kmacy (mentor)
MFC after:1 month
Modified:
head/sys/kern/kern_alq.c
Modified: head/sys/kern/kern_alq.c
==
--- head/sys/kern/kern_alq.cThu Apr 1 00:38:38 2010(r206025)
+++ head/sys/kern/kern_alq.cThu Apr 1 01:16:00 2010(r206026)
@@ -103,6 +103,7 @@ static void ald_deactivate(struct alq *)
/* Internal queue functions */
static void alq_shutdown(struct alq *);
+static void alq_destroy(struct alq *);
static int alq_doio(struct alq *);
@@ -263,6 +264,18 @@ alq_shutdown(struct alq *alq)
crfree(alq->aq_cred);
}
+void
+alq_destroy(struct alq *alq)
+{
+ /* Drain all pending IO. */
+ alq_shutdown(alq);
+
+ mtx_destroy(&alq->aq_mtx);
+ free(alq->aq_first, M_ALD);
+ free(alq->aq_entbuf, M_ALD);
+ free(alq, M_ALD);
+}
+
/*
* Flush all pending data to disk. This operation will block.
*/
@@ -420,8 +433,11 @@ alq_open(struct alq **alqp, const char *
alp->ae_next = alq->aq_first;
- if ((error = ald_add(alq)) != 0)
+ if ((error = ald_add(alq)) != 0) {
+ alq_destroy(alq);
return (error);
+ }
+
*alqp = alq;
return (0);
@@ -525,22 +541,9 @@ alq_flush(struct alq *alq)
void
alq_close(struct alq *alq)
{
- /*
-* If we're already shuting down someone else will flush and close
-* the vnode.
-*/
- if (ald_rem(alq) != 0)
- return;
-
- /*
-* Drain all pending IO.
-*/
- alq_shutdown(alq);
-
- mtx_destroy(&alq->aq_mtx);
- free(alq->aq_first, M_ALD);
- free(alq->aq_entbuf, M_ALD);
- free(alq, M_ALD);
+ /* Only flush and destroy alq if not already shutting down. */
+ if (ald_rem(alq) == 0)
+ alq_destroy(alq);
}
static int
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206023 - head/sys/dev/e1000
Author: jfv
Date: Wed Mar 31 23:24:42 2010
New Revision: 206023
URL: http://svn.freebsd.org/changeset/base/206023
Log:
The POLL code was missed in the queue conversion,
change the argument type to igb_rxeof() to the
correct type. Note, any users of POLLING must
be sure and set the number of queues to 1 for
things to work correctly.
Modified:
head/sys/dev/e1000/if_igb.c
Modified: head/sys/dev/e1000/if_igb.c
==
--- head/sys/dev/e1000/if_igb.c Wed Mar 31 23:02:25 2010(r206022)
+++ head/sys/dev/e1000/if_igb.c Wed Mar 31 23:24:42 2010(r206023)
@@ -1316,7 +1316,8 @@ igb_irq_fast(void *arg)
#ifdef DEVICE_POLLING
/*
*
- * Legacy polling routine
+ * Legacy polling routine : if using this code you MUST be sure that
+ * multiqueue is not defined, ie, set igb_num_queues to 1.
*
*/
#if __FreeBSD_version >= 80
@@ -1328,12 +1329,12 @@ static void
#endif
igb_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
{
- struct adapter *adapter = ifp->if_softc;
- struct rx_ring *rxr = adapter->rx_rings;
- struct tx_ring *txr = adapter->tx_rings;
- u32 reg_icr, rx_done = 0;
- u32 loop = IGB_MAX_LOOP;
- boolmore;
+ struct adapter *adapter = ifp->if_softc;
+ struct igb_queue*que = adapter->queues;
+ struct tx_ring *txr = adapter->tx_rings;
+ u32 reg_icr, rx_done = 0;
+ u32 loop = IGB_MAX_LOOP;
+ boolmore;
IGB_CORE_LOCK(adapter);
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
@@ -1353,7 +1354,7 @@ igb_poll(struct ifnet *ifp, enum poll_cm
IGB_CORE_UNLOCK(adapter);
/* TODO: rx_count */
- rx_done = igb_rxeof(rxr, count) ? 1 : 0;
+ rx_done = igb_rxeof(que, count) ? 1 : 0;
IGB_TX_LOCK(txr);
do {
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206022 - head/sys/netinet
Author: delphij Date: Wed Mar 31 23:02:25 2010 New Revision: 206022 URL: http://svn.freebsd.org/changeset/base/206022 Log: Add definition of IPv6 mobility header's protocol number, as assigned by IANA and defined in RFC 3775. Obtained from:KAME Modified: head/sys/netinet/in.h Modified: head/sys/netinet/in.h == --- head/sys/netinet/in.h Wed Mar 31 22:47:55 2010(r206021) +++ head/sys/netinet/in.h Wed Mar 31 23:02:25 2010(r206022) @@ -236,6 +236,7 @@ __END_DECLS #defineIPPROTO_GMTP100 /* GMTP*/ #defineIPPROTO_IPCOMP 108 /* payload compression (IPComp) */ #defineIPPROTO_SCTP132 /* SCTP */ +#defineIPPROTO_MH 135 /* IPv6 Mobility Header */ /* 101-254: Partly Unassigned */ #defineIPPROTO_PIM 103 /* Protocol Independent Mcast */ #defineIPPROTO_CARP112 /* CARP */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206021 - head/sys/netgraph
Author: mav Date: Wed Mar 31 22:47:55 2010 New Revision: 206021 URL: http://svn.freebsd.org/changeset/base/206021 Log: Remove some more alignment constraints. Modified: head/sys/netgraph/ng_mppc.c head/sys/netgraph/ng_ppp.c Modified: head/sys/netgraph/ng_mppc.c == --- head/sys/netgraph/ng_mppc.c Wed Mar 31 22:32:56 2010(r206020) +++ head/sys/netgraph/ng_mppc.c Wed Mar 31 22:47:55 2010(r206021) @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -601,7 +602,7 @@ err1: /* Install header */ M_PREPEND(m, MPPC_HDRLEN, M_DONTWAIT); if (m != NULL) - *(mtod(m, uint16_t *)) = htons(header); + be16enc(mtod(m, void *), header); *datap = m; return (*datap == NULL ? ENOBUFS : 0); @@ -630,8 +631,7 @@ ng_mppc_decompress(node_p node, struct m m_freem(m); return (EINVAL); } - m_copydata(m, 0, MPPC_HDRLEN, (caddr_t)&header); - header = ntohs(header); + header = be16dec(mtod(m, void *)); cc = (header & MPPC_CCOUNT_MASK); m_adj(m, MPPC_HDRLEN); Modified: head/sys/netgraph/ng_ppp.c == --- head/sys/netgraph/ng_ppp.c Wed Mar 31 22:32:56 2010(r206020) +++ head/sys/netgraph/ng_ppp.c Wed Mar 31 22:47:55 2010(r206021) @@ -97,6 +97,7 @@ #include #include #include +#include #include #include @@ -860,8 +861,8 @@ ng_ppp_rcvdata_bypass(hook_p hook, item_ NG_FREE_ITEM(item); return (ENOBUFS); } - linkNum = ntohs(mtod(m, uint16_t *)[0]); - proto = ntohs(mtod(m, uint16_t *)[1]); + linkNum = be16dec(mtod(m, uint8_t *)); + proto = be16dec(mtod(m, uint8_t *) + 2); m_adj(m, 4); NGI_M(item) = m; @@ -1544,7 +1545,7 @@ ng_ppp_mp_recv(node_p node, item_p item, if (m->m_len < 2 && (m = m_pullup(m, 2)) == NULL) ERROUT(ENOBUFS); - shdr = ntohs(*mtod(m, uint16_t *)); + shdr = be16dec(mtod(m, void *)); frag->seq = MP_SHORT_EXTEND(shdr); frag->first = (shdr & MP_SHORT_FIRST_FLAG) != 0; frag->last = (shdr & MP_SHORT_LAST_FLAG) != 0; @@ -1561,7 +1562,7 @@ ng_ppp_mp_recv(node_p node, item_p item, if (m->m_len < 4 && (m = m_pullup(m, 4)) == NULL) ERROUT(ENOBUFS); - lhdr = ntohl(*mtod(m, uint32_t *)); + lhdr = be32dec(mtod(m, void *)); frag->seq = MP_LONG_EXTEND(lhdr); frag->first = (lhdr & MP_LONG_FIRST_FLAG) != 0; frag->last = (lhdr & MP_LONG_LAST_FLAG) != 0; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206020 - head/sys/sparc64/pci
Author: marius
Date: Wed Mar 31 22:32:56 2010
New Revision: 206020
URL: http://svn.freebsd.org/changeset/base/206020
Log:
Use device_get_nameunit(9) rather than device_get_name(9) so one can
identify the reporting bridge in machines with multiple PCI domains.
Modified:
head/sys/sparc64/pci/psycho.c
head/sys/sparc64/pci/schizo.c
Modified: head/sys/sparc64/pci/psycho.c
==
--- head/sys/sparc64/pci/psycho.c Wed Mar 31 22:27:33 2010
(r206019)
+++ head/sys/sparc64/pci/psycho.c Wed Mar 31 22:32:56 2010
(r206020)
@@ -808,7 +808,7 @@ psycho_ue(void *arg)
if ((afsr & UEAFSR_P_DTE) != 0)
iommu_decode_fault(sc->sc_is, afar);
panic("%s: uncorrectable DMA error AFAR %#lx AFSR %#lx",
- device_get_name(sc->sc_dev), (u_long)afar, (u_long)afsr);
+ device_get_nameunit(sc->sc_dev), (u_long)afar, (u_long)afsr);
return (FILTER_HANDLED);
}
@@ -838,7 +838,7 @@ psycho_pci_bus(void *arg)
afar = PCICTL_READ8(sc, PCR_AFA);
afsr = PCICTL_READ8(sc, PCR_AFS);
panic("%s: PCI bus %c error AFAR %#lx AFSR %#lx",
- device_get_name(sc->sc_dev), 'A' + sc->sc_half, (u_long)afar,
+ device_get_nameunit(sc->sc_dev), 'A' + sc->sc_half, (u_long)afar,
(u_long)afsr);
return (FILTER_HANDLED);
}
Modified: head/sys/sparc64/pci/schizo.c
==
--- head/sys/sparc64/pci/schizo.c Wed Mar 31 22:27:33 2010
(r206019)
+++ head/sys/sparc64/pci/schizo.c Wed Mar 31 22:32:56 2010
(r206020)
@@ -826,7 +826,7 @@ schizo_pci_bus(void *arg)
}
panic("%s: PCI bus %c error AFAR %#llx AFSR %#llx PCI CSR %#llx "
- "IOMMU %#llx STATUS %#llx", device_get_name(sc->sc_dev),
+ "IOMMU %#llx STATUS %#llx", device_get_nameunit(sc->sc_dev),
'A' + sc->sc_half, (unsigned long long)afar,
(unsigned long long)afsr, (unsigned long long)csr,
(unsigned long long)iommu, (unsigned long long)status);
@@ -861,7 +861,7 @@ schizo_ue(void *arg)
break;
mtx_unlock_spin(sc->sc_mtx);
panic("%s: uncorrectable DMA error AFAR %#llx AFSR %#llx",
- device_get_name(sc->sc_dev), (unsigned long long)afar,
+ device_get_nameunit(sc->sc_dev), (unsigned long long)afar,
(unsigned long long)afsr);
return (FILTER_HANDLED);
}
@@ -895,7 +895,7 @@ schizo_host_bus(void *arg)
uint64_t errlog;
errlog = SCHIZO_CTRL_READ_8(sc, STX_CTRL_BUS_ERRLOG);
- panic("%s: %s error %#llx", device_get_name(sc->sc_dev),
+ panic("%s: %s error %#llx", device_get_nameunit(sc->sc_dev),
sc->sc_mode == SCHIZO_MODE_TOM ? "JBus" : "Safari",
(unsigned long long)errlog);
return (FILTER_HANDLED);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206019 - head/sys/sparc64/pci
Author: marius
Date: Wed Mar 31 22:27:33 2010
New Revision: 206019
URL: http://svn.freebsd.org/changeset/base/206019
Log:
Don't re-implement device_get_nameunit(9).
Modified:
head/sys/sparc64/pci/apb.c
Modified: head/sys/sparc64/pci/apb.c
==
--- head/sys/sparc64/pci/apb.c Wed Mar 31 22:19:00 2010(r206018)
+++ head/sys/sparc64/pci/apb.c Wed Mar 31 22:27:33 2010(r206019)
@@ -223,8 +223,7 @@ apb_alloc_resource(device_t dev, device_
*/
if (start == 0 && end == ~0) {
device_printf(dev, "can't decode default resource id %d for "
- "%s%d, bypassing\n", *rid, device_get_name(child),
- device_get_unit(child));
+ "%s, bypassing\n", *rid, device_get_nameunit(child));
goto passup;
}
@@ -236,31 +235,28 @@ apb_alloc_resource(device_t dev, device_
switch (type) {
case SYS_RES_IOPORT:
if (!apb_checkrange(sc->sc_iomap, APB_IO_SCALE, start, end)) {
- device_printf(dev, "device %s%d requested unsupported "
- "I/O range 0x%lx-0x%lx\n", device_get_name(child),
- device_get_unit(child), start, end);
+ device_printf(dev, "device %s requested unsupported "
+ "I/O range 0x%lx-0x%lx\n",
+ device_get_nameunit(child), start, end);
return (NULL);
}
if (bootverbose)
device_printf(sc->sc_bsc.ops_pcib_sc.dev, "device "
- "%s%d requested decoded I/O range 0x%lx-0x%lx\n",
- device_get_name(child), device_get_unit(child),
- start, end);
+ "%s requested decoded I/O range 0x%lx-0x%lx\n",
+ device_get_nameunit(child), start, end);
break;
case SYS_RES_MEMORY:
if (!apb_checkrange(sc->sc_memmap, APB_MEM_SCALE, start, end)) {
- device_printf(dev, "device %s%d requested unsupported "
+ device_printf(dev, "device %s requested unsupported "
"memory range 0x%lx-0x%lx\n",
- device_get_name(child), device_get_unit(child),
- start, end);
+ device_get_nameunit(child), start, end);
return (NULL);
}
if (bootverbose)
device_printf(sc->sc_bsc.ops_pcib_sc.dev, "device "
- "%s%d requested decoded memory range 0x%lx-0x%lx\n",
- device_get_name(child), device_get_unit(child),
- start, end);
+ "%s requested decoded memory range 0x%lx-0x%lx\n",
+ device_get_nameunit(child), start, end);
break;
default:
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206018 - in head/sys/sparc64: fhc pci sbus
Author: marius
Date: Wed Mar 31 22:19:00 2010
New Revision: 206018
URL: http://svn.freebsd.org/changeset/base/206018
Log:
- Take advantage of the INTCLR_* macros.
- Right-justify the backslashes as per style(9).
Modified:
head/sys/sparc64/fhc/fhc.c
head/sys/sparc64/pci/psycho.c
head/sys/sparc64/pci/schizo.c
head/sys/sparc64/sbus/sbus.c
Modified: head/sys/sparc64/fhc/fhc.c
==
--- head/sys/sparc64/fhc/fhc.c Wed Mar 31 22:16:05 2010(r206017)
+++ head/sys/sparc64/fhc/fhc.c Wed Mar 31 22:19:00 2010(r206018)
@@ -208,7 +208,7 @@ fhc_attach(device_t dev)
printf("model unknown\n");
for (i = FHC_FANFAIL; i <= FHC_TOD; i++) {
- bus_write_4(sc->sc_memres[i], FHC_ICLR, 0x0);
+ bus_write_4(sc->sc_memres[i], FHC_ICLR, INTCLR_IDLE);
(void)bus_read_4(sc->sc_memres[i], FHC_ICLR);
}
@@ -391,7 +391,7 @@ fhc_intr_clear(void *arg)
struct intr_vector *iv = arg;
struct fhc_icarg *fica = iv->iv_icarg;
- bus_write_4(fica->fica_memres, FHC_ICLR, 0x0);
+ bus_write_4(fica->fica_memres, FHC_ICLR, INTCLR_IDLE);
(void)bus_read_4(fica->fica_memres, FHC_ICLR);
}
Modified: head/sys/sparc64/pci/psycho.c
==
--- head/sys/sparc64/pci/psycho.c Wed Mar 31 22:16:05 2010
(r206017)
+++ head/sys/sparc64/pci/psycho.c Wed Mar 31 22:19:00 2010
(r206018)
@@ -188,13 +188,13 @@ struct psycho_dma_sync {
uint8_t pds_func; /* func. of farest PCI dev. */
};
-#definePSYCHO_READ8(sc, off) \
+#definePSYCHO_READ8(sc, off)
\
bus_read_8((sc)->sc_mem_res, (off))
-#definePSYCHO_WRITE8(sc, off, v) \
+#definePSYCHO_WRITE8(sc, off, v)
\
bus_write_8((sc)->sc_mem_res, (off), (v))
-#definePCICTL_READ8(sc, off) \
+#definePCICTL_READ8(sc, off)
\
PSYCHO_READ8((sc), (sc)->sc_pcictl + (off))
-#definePCICTL_WRITE8(sc, off, v) \
+#definePCICTL_WRITE8(sc, off, v)
\
PSYCHO_WRITE8((sc), (sc)->sc_pcictl + (off), (v))
/*
@@ -523,7 +523,7 @@ psycho_attach(device_t dev)
(u_long)intrmap, (u_long)PSYCHO_READ8(sc,
intrmap), (u_long)intrclr);
PSYCHO_WRITE8(sc, intrmap, INTMAP_VEC(sc->sc_ign, i));
- PSYCHO_WRITE8(sc, intrclr, 0);
+ PSYCHO_WRITE8(sc, intrclr, INTCLR_IDLE);
PSYCHO_WRITE8(sc, intrmap,
INTMAP_ENABLE(INTMAP_VEC(sc->sc_ign, i),
PCPU_GET(mid)));
@@ -1137,7 +1137,7 @@ psycho_intr_clear(void *arg)
struct intr_vector *iv = arg;
struct psycho_icarg *pica = iv->iv_icarg;
- PSYCHO_WRITE8(pica->pica_sc, pica->pica_clr, 0);
+ PSYCHO_WRITE8(pica->pica_sc, pica->pica_clr, INTCLR_IDLE);
}
static int
Modified: head/sys/sparc64/pci/schizo.c
==
--- head/sys/sparc64/pci/schizo.c Wed Mar 31 22:16:05 2010
(r206017)
+++ head/sys/sparc64/pci/schizo.c Wed Mar 31 22:19:00 2010
(r206018)
@@ -189,26 +189,26 @@ struct schizo_dma_sync {
#defineSCHIZO_PERF_CNT_QLTY100
-#defineSCHIZO_SPC_READ_8(spc, sc, offs) \
+#defineSCHIZO_SPC_READ_8(spc, sc, offs)
\
bus_read_8((sc)->sc_mem_res[(spc)], (offs))
-#defineSCHIZO_SPC_WRITE_8(spc, sc, offs, v) \
+#defineSCHIZO_SPC_WRITE_8(spc, sc, offs, v)
\
bus_write_8((sc)->sc_mem_res[(spc)], (offs), (v))
-#defineSCHIZO_PCI_READ_8(sc, offs) \
+#defineSCHIZO_PCI_READ_8(sc, offs)
\
SCHIZO_SPC_READ_8(STX_PCI, (sc), (offs))
-#defineSCHIZO_PCI_WRITE_8(sc, offs, v) \
+#defineSCHIZO_PCI_WRITE_8(sc, offs, v)
\
SCHIZO_SPC_WRITE_8(STX_PCI, (sc), (offs), (v))
-#defineSCHIZO_CTRL_READ_8(sc, offs) \
+#defineSCHIZO_CTRL_READ_8(sc, offs)
\
SCHIZO_SPC_READ_8(STX_CTRL, (sc), (offs))
-#defineSCHIZO_CTRL_WRITE_8(sc, offs, v) \
+#defineSCHIZO_CTRL_WRITE_8(sc, offs, v)
\
SCHIZO_SPC_WRITE_8(STX_CTRL, (sc), (offs), (v))
-#defineSCHIZO_PCICFG_READ_8(sc, offs) \
+#defineSCHIZO_PCICFG_READ_8(sc, offs)
\
SCHIZO_SPC_READ_8(STX_PCICFG, (sc), (offs))
-#defineSCHIZO_PCICFG_WRITE_8(sc, offs, v) \
+#defineSCHIZO_PCICFG_WRITE_8(
svn commit: r206017 - head/sys/netgraph
Author: mav
Date: Wed Mar 31 22:16:05 2010
New Revision: 206017
URL: http://svn.freebsd.org/changeset/base/206017
Log:
Make ng_ksocket fulfill lower protocol stack layers alignment requirements
on platforms with strict alignment constraints.
This fixes kernel panics on arm and probably other architectures.
PR: sparc64/80410
Modified:
head/sys/netgraph/ng_ksocket.c
Modified: head/sys/netgraph/ng_ksocket.c
==
--- head/sys/netgraph/ng_ksocket.c Wed Mar 31 22:11:19 2010
(r206016)
+++ head/sys/netgraph/ng_ksocket.c Wed Mar 31 22:16:05 2010
(r206017)
@@ -902,12 +902,24 @@ ng_ksocket_rcvdata(hook_p hook, item_p i
struct sockaddr *sa = NULL;
int error;
struct mbuf *m;
+#ifdef ALIGNED_POINTER
+ struct mbuf *n;
+#endif /* ALIGNED_POINTER */
struct sa_tag *stag;
/* Extract data */
NGI_GET_M(item, m);
NG_FREE_ITEM(item);
-
+#ifdef ALIGNED_POINTER
+ if (!ALIGNED_POINTER(mtod(m, caddr_t), uint32_t)) {
+ n = m_defrag(m, M_NOWAIT);
+ if (n == NULL) {
+ m_freem(m);
+ return (ENOBUFS);
+ }
+ m = n;
+ }
+#endif /* ALIGNED_POINTER */
/*
* Look if socket address is stored in packet tags.
* If sockaddr is ours, or provided by a third party (zero id),
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206015 - head/sys/netgraph
Author: mav
Date: Wed Mar 31 22:11:06 2010
New Revision: 206015
URL: http://svn.freebsd.org/changeset/base/206015
Log:
Make ng_l2tp irrelevant to data alignment.
Modified:
head/sys/netgraph/ng_l2tp.c
Modified: head/sys/netgraph/ng_l2tp.c
==
--- head/sys/netgraph/ng_l2tp.c Wed Mar 31 22:05:53 2010(r206014)
+++ head/sys/netgraph/ng_l2tp.c Wed Mar 31 22:11:06 2010(r206015)
@@ -790,7 +790,7 @@ ng_l2tp_rcvdata_lower(hook_p h, item_p i
NG_FREE_ITEM(item);
ERROUT(EINVAL);
}
- hdr = ntohs(*mtod(m, u_int16_t *));
+ hdr = (mtod(m, uint8_t *)[0] << 8) + mtod(m, uint8_t *)[1];
m_adj(m, 2);
/* Check required header bits and minimum length */
@@ -819,7 +819,7 @@ ng_l2tp_rcvdata_lower(hook_p h, item_p i
NG_FREE_ITEM(item);
ERROUT(EINVAL);
}
- len = (u_int16_t)ntohs(*mtod(m, u_int16_t *)) - 4;
+ len = (mtod(m, uint8_t *)[0] << 8) + mtod(m, uint8_t *)[1] - 4;
m_adj(m, 2);
if (len < 0 || len > m->m_pkthdr.len) {
priv->stats.recvInvalid++;
@@ -1095,9 +1095,10 @@ ng_l2tp_rcvdata(hook_p hook, item_p item
const priv_p priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
const hookpriv_p hpriv = NG_HOOK_PRIVATE(hook);
struct mbuf *m;
+ uint8_t *p;
u_int16_t hdr;
int error;
- int i = 1;
+ int i = 2;
/* Sanity check */
L2TP_SEQ_CHECK(&priv->seq);
@@ -1129,20 +1130,27 @@ ng_l2tp_rcvdata(hook_p hook, item_p item
NG_FREE_ITEM(item);
ERROUT(ENOBUFS);
}
+ p = mtod(m, uint8_t *);
hdr = L2TP_DATA_HDR;
if (hpriv->conf.include_length) {
hdr |= L2TP_HDR_LEN;
- mtod(m, u_int16_t *)[i++] = htons(m->m_pkthdr.len);
+ p[i++] = m->m_pkthdr.len >> 8;
+ p[i++] = m->m_pkthdr.len & 0xff;
}
- mtod(m, u_int16_t *)[i++] = htons(priv->conf.peer_id);
- mtod(m, u_int16_t *)[i++] = htons(hpriv->conf.peer_id);
+ p[i++] = priv->conf.peer_id >> 8;
+ p[i++] = priv->conf.peer_id & 0xff;
+ p[i++] = hpriv->conf.peer_id >> 8;
+ p[i++] = hpriv->conf.peer_id & 0xff;
if (hpriv->conf.enable_dseq) {
hdr |= L2TP_HDR_SEQ;
- mtod(m, u_int16_t *)[i++] = htons(hpriv->ns);
- mtod(m, u_int16_t *)[i++] = htons(hpriv->nr);
+ p[i++] = hpriv->ns >> 8;
+ p[i++] = hpriv->ns & 0xff;
+ p[i++] = hpriv->nr >> 8;
+ p[i++] = hpriv->nr & 0xff;
hpriv->ns++;
}
- mtod(m, u_int16_t *)[0] = htons(hdr);
+ p[0] = hdr >> 8;
+ p[1] = hdr & 0xff;
/* Update per session stats. */
hpriv->stats.xmitPackets++;
@@ -1496,6 +1504,7 @@ static int
ng_l2tp_xmit_ctrl(priv_p priv, struct mbuf *m, u_int16_t ns)
{
struct l2tp_seq *const seq = &priv->seq;
+ uint8_t *p;
u_int16_t session_id = 0;
int error;
@@ -1540,12 +1549,19 @@ ng_l2tp_xmit_ctrl(priv_p priv, struct mb
}
/* Fill in L2TP header */
- mtod(m, u_int16_t *)[0] = htons(L2TP_CTRL_HDR);
- mtod(m, u_int16_t *)[1] = htons(m->m_pkthdr.len);
- mtod(m, u_int16_t *)[2] = htons(priv->conf.peer_id);
- mtod(m, u_int16_t *)[3] = htons(session_id);
- mtod(m, u_int16_t *)[4] = htons(ns);
- mtod(m, u_int16_t *)[5] = htons(seq->nr);
+ p = mtod(m, u_int8_t *);
+ p[0] = L2TP_CTRL_HDR >> 8;
+ p[1] = L2TP_CTRL_HDR & 0xff;
+ p[2] = m->m_pkthdr.len >> 8;
+ p[3] = m->m_pkthdr.len & 0xff;
+ p[4] = priv->conf.peer_id >> 8;
+ p[5] = priv->conf.peer_id & 0xff;
+ p[6] = session_id >> 8;
+ p[7] = session_id & 0xff;
+ p[8] = ns >> 8;
+ p[9] = ns & 0xff;
+ p[10] = seq->nr >> 8;
+ p[11] = seq->nr & 0xff;
/* Update sequence number info and stats */
priv->stats.xmitPackets++;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r206002 - head/lib/libz
Author: delphij
Date: Wed Mar 31 20:55:13 2010
New Revision: 206002
URL: http://svn.freebsd.org/changeset/base/206002
Log:
Update to 1.2.4.1 (beta).
Modified:
head/lib/libz/ChangeLog
head/lib/libz/README
head/lib/libz/crc32.c
head/lib/libz/deflate.c
head/lib/libz/gzguts.h (contents, props changed)
head/lib/libz/gzlib.c
head/lib/libz/gzread.c
head/lib/libz/inftrees.c
head/lib/libz/minigzip.c
head/lib/libz/zconf.h
head/lib/libz/zlib.3
head/lib/libz/zlib.h
head/lib/libz/zutil.c
head/lib/libz/zutil.h
Directory Properties:
head/lib/libz/ (props changed)
Modified: head/lib/libz/ChangeLog
==
--- head/lib/libz/ChangeLog Wed Mar 31 20:43:24 2010(r206001)
+++ head/lib/libz/ChangeLog Wed Mar 31 20:55:13 2010(r206002)
@@ -1,6 +1,30 @@
ChangeLog file for zlib
+Changes in 1.2.4.1 (28 Mar 2010)
+- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
+- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
+- Restore "for debugging" comment on sprintf() in gzlib.c
+- Remove fdopen for MVS from gzguts.h
+- Put new README-WIN32.txt in win32 [Rowe]
+- Add check for shell to configure and invoke another shell if needed
+- Fix big fat stinking bug in gzseek() on uncompressed files
+- Remove vestigial F_OPEN64 define in zutil.h
+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
+- Avoid errors on non-LFS systems when applications define LFS macros
+- Set EXE to ".exe" in configure for MINGW [Kahle]
+- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
+- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
+- Add DLL install in win32/makefile.gcc [Bar-Lev]
+- Allow Linux* or linux* from uname in configure [Bar-Lev]
+- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
+- Add cross-compilation prefixes to configure [Bar-Lev]
+- Match type exactly in gz_load() invocation in gzread.c
+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
+- Provide prototypes for *64 functions when building zlib without LFS
+- Don't use -lc when linking shared library on MinGW
+- Remove errno.h check in configure and vestigial errno code in zutil.h
+
Changes in 1.2.4 (14 Mar 2010)
- Fix VER3 extraction in configure for no fourth subversion
- Update zlib.3, add docs to Makefile.in to make .pdf out of it
Modified: head/lib/libz/README
==
--- head/lib/libz/READMEWed Mar 31 20:43:24 2010(r206001)
+++ head/lib/libz/READMEWed Mar 31 20:55:13 2010(r206002)
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.4 is a general purpose data compression library. All the code is
+zlib 1.2.4.1 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -30,7 +30,7 @@ Mark Nelson wrote an ar
issue of Dr. Dobb's Journal; a copy of the article is available at
http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.4 are documented in the file ChangeLog.
+The changes made in version 1.2.4.1 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .
Modified: head/lib/libz/crc32.c
==
--- head/lib/libz/crc32.c Wed Mar 31 20:43:24 2010(r206001)
+++ head/lib/libz/crc32.c Wed Mar 31 20:55:13 2010(r206002)
@@ -221,7 +221,7 @@ const unsigned long FAR * ZEXPORT get_cr
unsigned long ZEXPORT crc32(crc, buf, len)
unsigned long crc;
const unsigned char FAR *buf;
-unsigned len;
+uInt len;
{
if (buf == Z_NULL) return 0UL;
Modified: head/lib/libz/deflate.c
==
--- head/lib/libz/deflate.c Wed Mar 31 20:43:24 2010(r206001)
+++ head/lib/libz/deflate.c Wed Mar 31 20:55:13 2010(r206002)
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.4 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.4.1 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
Modified: head/lib/libz/gzguts.h
==
--- head/lib/libz/gzguts.h Wed Mar 31 20:43:24 2010(r206001)
+++ head/lib/libz/gzguts.h Wed Mar 31 20:55:13 2010(r206002)
@@ -3,9 +3,9 @@
* For conditions of distribution and use, see copyright
svn commit: r206001 - head/sys/dev/e1000
Author: marius
Date: Wed Mar 31 20:43:24 2010
New Revision: 206001
URL: http://svn.freebsd.org/changeset/base/206001
Log:
Hook the identification LEDs of igb(4), lem(4) and em(4) devices up with
led(4) so they can be lit or f.e. made blink via `echo f2 > /dev/led/em0`
for localization purposes.
Approved by: jfv
MFC afer: 1 week (after r205869)
Modified:
head/sys/dev/e1000/if_em.c
head/sys/dev/e1000/if_em.h
head/sys/dev/e1000/if_igb.c
head/sys/dev/e1000/if_igb.h
head/sys/dev/e1000/if_lem.c
head/sys/dev/e1000/if_lem.h
Modified: head/sys/dev/e1000/if_em.c
==
--- head/sys/dev/e1000/if_em.c Wed Mar 31 20:37:44 2010(r206000)
+++ head/sys/dev/e1000/if_em.c Wed Mar 31 20:43:24 2010(r206001)
@@ -77,6 +77,7 @@
#include
#include
+#include
#include
#include
@@ -267,6 +268,7 @@ static void em_release_hw_control(st
static voidem_get_wakeup(device_t);
static void em_enable_wakeup(device_t);
static int em_enable_phy_wakeup(struct adapter *);
+static voidem_led_func(void *, int);
static int em_irq_fast(void *);
@@ -656,6 +658,9 @@ em_attach(device_t dev)
/* Tell the stack that the interface is not active */
adapter->ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+ adapter->led_dev = led_create(em_led_func, adapter,
+ device_get_nameunit(dev));
+
INIT_DEBUGOUT("em_attach: end");
return (0);
@@ -769,6 +774,9 @@ em_resume(device_t dev)
struct adapter *adapter = device_get_softc(dev);
struct ifnet *ifp = adapter->ifp;
+ if (adapter->led_dev != NULL)
+ led_destroy(adapter->led_dev);
+
EM_CORE_LOCK(adapter);
em_init_locked(adapter);
em_init_manageability(adapter);
@@ -2163,6 +2171,9 @@ em_stop(void *arg)
e1000_reset_hw(&adapter->hw);
E1000_WRITE_REG(&adapter->hw, E1000_WUC, 0);
+
+ e1000_led_off(&adapter->hw);
+ e1000_cleanup_led(&adapter->hw);
}
@@ -4538,7 +4549,7 @@ em_get_wakeup(device_t dev)
/*
* Enable PCI Wake On Lan capability
*/
-void
+static void
em_enable_wakeup(device_t dev)
{
struct adapter *adapter = device_get_softc(dev);
@@ -4690,6 +4701,22 @@ out:
return ret;
}
+static void
+em_led_func(void *arg, int onoff)
+{
+ struct adapter *adapter = arg;
+
+ EM_CORE_LOCK(adapter);
+ if (onoff) {
+ e1000_setup_led(&adapter->hw);
+ e1000_led_on(&adapter->hw);
+ } else {
+ e1000_led_off(&adapter->hw);
+ e1000_cleanup_led(&adapter->hw);
+ }
+ EM_CORE_UNLOCK(adapter);
+}
+
/**
*
* Update the board statistics counters.
Modified: head/sys/dev/e1000/if_em.h
==
--- head/sys/dev/e1000/if_em.h Wed Mar 31 20:37:44 2010(r206000)
+++ head/sys/dev/e1000/if_em.h Wed Mar 31 20:43:24 2010(r206001)
@@ -337,6 +337,7 @@ struct adapter {
/* FreeBSD operating-system-specific structures. */
struct e1000_osdep osdep;
struct device *dev;
+ struct cdev *led_dev;
struct resource *memory;
struct resource *flash;
Modified: head/sys/dev/e1000/if_igb.c
==
--- head/sys/dev/e1000/if_igb.c Wed Mar 31 20:37:44 2010(r206000)
+++ head/sys/dev/e1000/if_igb.c Wed Mar 31 20:43:24 2010(r206001)
@@ -83,6 +83,7 @@
#include
#include
+#include
#include
#include
@@ -234,6 +235,7 @@ static void igb_release_manageability(st
static void igb_get_hw_control(struct adapter *);
static void igb_release_hw_control(struct adapter *);
static void igb_enable_wakeup(device_t);
+static void igb_led_func(void *, int);
static int igb_irq_fast(void *);
static voidigb_add_rx_process_limit(struct adapter *, const char *,
@@ -585,6 +587,9 @@ igb_attach(device_t dev)
/* Tell the stack that the interface is not active */
adapter->ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+ adapter->led_dev = led_create(igb_led_func, adapter,
+ device_get_nameunit(dev));
+
INIT_DEBUGOUT("igb_attach: end");
return (0);
@@ -624,6 +629,9 @@ igb_detach(device_t dev)
return (EBUSY);
}
+ if (adapter->led_dev != NULL)
+ led_destroy(adapter->led_dev);
+
#ifdef DEVICE_POLLING
if (ifp->if_capenable & IFCAP_POLLING)
ether_poll_deregister(ifp);
@@ -2002,6 +2010,9 @@ igb_stop(void *arg)
e1000_reset_hw(&adapter->hw);
E1000_WRITE_REG(&adapter->hw, E1000_WUC, 0);
+
+ e1000_led_off(&adapter->hw);
+ e1000_cleanup_led(&adapter->hw);
}
@@ -4613,7 +4624,7 @@ i
svn commit: r206000 - head/sys/netgraph
Author: mav
Date: Wed Mar 31 20:37:44 2010
New Revision: 206000
URL: http://svn.freebsd.org/changeset/base/206000
Log:
Make ng_ppp fulfill upper protocol stack layers alignment requirements
on platforms with strict alignment constraints.
This fixes kernel panics on arm and probably other architectures.
PR: sparc64/80410
Modified:
head/sys/netgraph/ng_ppp.c
Modified: head/sys/netgraph/ng_ppp.c
==
--- head/sys/netgraph/ng_ppp.c Wed Mar 31 20:15:20 2010(r205999)
+++ head/sys/netgraph/ng_ppp.c Wed Mar 31 20:37:44 2010(r206000)
@@ -907,7 +907,21 @@ ng_ppp_proto_recv(node_p node, item_p it
const priv_p priv = NG_NODE_PRIVATE(node);
hook_p outHook = NULL;
int error;
+#ifdef ALIGNED_POINTER
+ struct mbuf *m, *n;
+ NGI_GET_M(item, m);
+ if (!ALIGNED_POINTER(mtod(m, caddr_t), uint32_t)) {
+ n = m_defrag(m, M_NOWAIT);
+ if (n == NULL) {
+ m_freem(m);
+ NG_FREE_ITEM(item);
+ return (ENOBUFS);
+ }
+ m = n;
+ }
+ NGI_M(item) = m;
+#endif /* ALIGNED_POINTER */
switch (proto) {
case PROT_IP:
if (priv->conf.enableIP)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205999 - head/sys/conf
Author: mav Date: Wed Mar 31 20:15:20 2010 New Revision: 205999 URL: http://svn.freebsd.org/changeset/base/205999 Log: ng_gif depends on gif. Modified: head/sys/conf/files Modified: head/sys/conf/files == --- head/sys/conf/files Wed Mar 31 20:00:44 2010(r205998) +++ head/sys/conf/files Wed Mar 31 20:15:20 2010(r205999) @@ -2322,7 +2322,7 @@ net/if_ethersubr.coptional ether \ net/if_faith.c optional faith net/if_fddisubr.c optional fddi net/if_fwsubr.coptional fwip -net/if_gif.c optional gif +net/if_gif.c optional gif | netgraph_gif net/if_gre.c optional gre inet net/if_iso88025subr.c optional token net/if_lagg.c optional lagg @@ -2485,7 +2485,7 @@ netinet/if_ether.coptional inet ether netinet/igmp.c optional inet netinet/in.c optional inet netinet/ip_carp.c optional inet carp | inet6 carp -netinet/in_gif.c optional gif inet +netinet/in_gif.c optional gif inet | netgraph_gif inet netinet/ip_gre.c optional gre inet netinet/ip_id.coptional inet netinet/in_mcast.c optional inet @@ -2560,7 +2560,7 @@ netinet6/frag6.c optional inet6 netinet6/icmp6.c optional inet6 netinet6/in6.c optional inet6 netinet6/in6_cksum.c optional inet6 -netinet6/in6_gif.c optional gif inet6 +netinet6/in6_gif.c optional gif inet6 | netgraph_gif inet6 netinet6/in6_ifattach.coptional inet6 netinet6/in6_mcast.c optional inet6 netinet6/in6_pcb.c optional inet6 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205998 - head/sys/dev/hwpmc
Author: fabient
Date: Wed Mar 31 20:00:44 2010
New Revision: 205998
URL: http://svn.freebsd.org/changeset/base/205998
Log:
If there is multiple PMCs for the same interrupt ignore new post.
This will indirectly fix a bug where the thread will be pinned
forever if the assert is not compiled.
MFC after: 3days
Modified:
head/sys/dev/hwpmc/hwpmc_mod.c
Modified: head/sys/dev/hwpmc/hwpmc_mod.c
==
--- head/sys/dev/hwpmc/hwpmc_mod.c Wed Mar 31 18:37:00 2010
(r205997)
+++ head/sys/dev/hwpmc/hwpmc_mod.c Wed Mar 31 20:00:44 2010
(r205998)
@@ -3972,9 +3972,11 @@ pmc_post_callchain_callback(void)
td = curthread;
- KASSERT((td->td_pflags & TDP_CALLCHAIN) == 0,
- ("[pmc,%d] thread %p already marked for callchain capture",
- __LINE__, (void *) td));
+ /*
+* If there is multiple PMCs for the same interrupt ignore new post
+*/
+ if (td->td_pflags & TDP_CALLCHAIN)
+ return;
/*
* Mark this thread as needing callchain capture.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205997 - head/lib/libc/gen
Author: delphij
Date: Wed Mar 31 18:37:00 2010
New Revision: 205997
URL: http://svn.freebsd.org/changeset/base/205997
Log:
Add prototype for libc internal interfaces.
Modified:
head/lib/libc/gen/__getosreldate.c
head/lib/libc/gen/_thread_init.c
Modified: head/lib/libc/gen/__getosreldate.c
==
--- head/lib/libc/gen/__getosreldate.c Wed Mar 31 18:36:04 2010
(r205996)
+++ head/lib/libc/gen/__getosreldate.c Wed Mar 31 18:37:00 2010
(r205997)
@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+int __getosreldate(void);
+
/*
* This is private to libc. It is intended for wrapping syscall stubs in order
* to avoid having to put SIGSYS signal handlers in place to test for presence
Modified: head/lib/libc/gen/_thread_init.c
==
--- head/lib/libc/gen/_thread_init.cWed Mar 31 18:36:04 2010
(r205996)
+++ head/lib/libc/gen/_thread_init.cWed Mar 31 18:37:00 2010
(r205997)
@@ -29,6 +29,8 @@ __FBSDID("$FreeBSD$");
#include
+void _thread_init_stub(void);
+
__weak_reference(_thread_init_stub, _thread_init);
__weak_reference(_thread_autoinit_dummy_decl_stub,
_thread_autoinit_dummy_decl);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205996 - head/lib/libc/gen
Author: delphij
Date: Wed Mar 31 18:36:04 2010
New Revision: 205996
URL: http://svn.freebsd.org/changeset/base/205996
Log:
Add prototypes for libc private interfaces.
While I'm there, apply __unused whenever appropriate.
Reviewed by: md5(1)
Modified:
head/lib/libc/gen/_spinlock_stub.c
Modified: head/lib/libc/gen/_spinlock_stub.c
==
--- head/lib/libc/gen/_spinlock_stub.c Wed Mar 31 18:21:25 2010
(r205995)
+++ head/lib/libc/gen/_spinlock_stub.c Wed Mar 31 18:36:04 2010
(r205996)
@@ -34,6 +34,11 @@ __FBSDID("$FreeBSD$");
#include "spinlock.h"
+long _atomic_lock_stub(volatile long *);
+void _spinlock_stub(spinlock_t *);
+void _spinunlock_stub(spinlock_t *);
+void _spinlock_debug_stub(spinlock_t *, char *, int);
+
/*
* Declare weak definitions in case the application is not linked
* with libpthread.
@@ -43,12 +48,11 @@ __weak_reference(_spinlock_stub, _spinlo
__weak_reference(_spinunlock_stub, _spinunlock);
__weak_reference(_spinlock_debug_stub, _spinlock_debug);
-
/*
* This function is a stub for the _atomic_lock function in libpthread.
*/
long
-_atomic_lock_stub(volatile long *lck)
+_atomic_lock_stub(volatile long *lck __unused)
{
return (0L);
}
@@ -58,7 +62,7 @@ _atomic_lock_stub(volatile long *lck)
* This function is a stub for the spinlock function in libpthread.
*/
void
-_spinlock_stub(spinlock_t *lck)
+_spinlock_stub(spinlock_t *lck __unused)
{
}
@@ -66,7 +70,7 @@ _spinlock_stub(spinlock_t *lck)
* This function is a stub for the spinunlock function in libpthread.
*/
void
-_spinunlock_stub(spinlock_t *lck)
+_spinunlock_stub(spinlock_t *lck __unused)
{
}
@@ -74,6 +78,6 @@ _spinunlock_stub(spinlock_t *lck)
* This function is a stub for the debug spinlock function in libpthread.
*/
void
-_spinlock_debug_stub(spinlock_t *lck, char *fname, int lineno)
+_spinlock_debug_stub(spinlock_t *lck __unused, char *fname __unused, int
lineno __unused)
{
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205995 - in head/games/fortune: . datfiles
Author: uqs Date: Wed Mar 31 18:21:25 2010 New Revision: 205995 URL: http://svn.freebsd.org/changeset/base/205995 Log: Sync fortunes with other *BSDs - Spelling errors - Typographical fixes - Consistent attributions - Use Jr. more consistently - Capitalization of dictionary-like entries - Sorting using tools/do_sort - Remove duplicate fortunes - Style according to the Notes file - Reflect correct default fortune name in Notes - Remove some no longer needed spelling hints - Drop latin1 characters (sorry Mårten) This is a partial sync against the DragonflyBSD sources, where a lot of fixes from Free, Net and OpenBSD were merged previously. Only about 50% of the changes originate from there, the rest was done by dougb and yours truly. Partial review by:wilko (earlier version), ed (dito) In collaboration with:dougb Approved by: ed (co-mentor) Modified: head/games/fortune/Notes head/games/fortune/datfiles/fortunes head/games/fortune/datfiles/fortunes-o.real head/games/fortune/datfiles/fortunes.sp.ok head/games/fortune/datfiles/limerick head/games/fortune/datfiles/startrek head/games/fortune/datfiles/zippy Modified: head/games/fortune/Notes == --- head/games/fortune/NotesWed Mar 31 18:18:37 2010(r205994) +++ head/games/fortune/NotesWed Mar 31 18:21:25 2010(r205995) @@ -19,13 +19,13 @@ Warning: /usr/share/games/fortune. A fortune file has two parts: the source file (which contains the fortunes themselves) and the data file which describes the fortunes. The data file always has the same name as the fortune file -with the string ".dat" concatenated, i.e. "fort" is the standard fortune -database, and "fort.dat" is the data file which describes it. See +with the string ".dat" concatenated, i.e. "fortunes" is the standard fortune +database, and "fortunes.dat" is the data file which describes it. See strfile(8) for more information on creating the data files. Fortunes are split into potentially offensive and not potentially offensive parts. The offensive version of a file has the same name as the -non-offensive version with "-o" concatenated, i.e. "fort" is the standard -fortune database, and "fort-o" is the standard offensive database. The +non-offensive version with "-o" concatenated, i.e. "fortunes" is the standard +fortune database, and "fortunes-o" is the standard offensive database. The fortune program automatically assumes that any file with a name ending in "-o" is potentially offensive, and should therefore only be displayed if explicitly requested, either with the -o option or by specifying a file name @@ -42,10 +42,10 @@ MUST be in the potentially offensive dat explicit language (see George Carlin's recent updated list) MUST be in the potentially offensive database. Political and religious opinions are often sequestered in the potentially offensive section as well. Anything which -assumes as a world view blatantly racist, mysogynist (sexist), or homophobic +assumes as a world view blatantly racist, misogynist (sexist), or homophobic ideas should not be in either, since they are not really funny unless *you* -are racist, mysogynist, or homophobic. - The point of this is that people have should have a reasonable +are racist, misogynist, or homophobic. + The point of this is that people should have a reasonable expectation that, should they just run "fortune", they will not be offended. We know that some people take offense at anything, but normal people do have opinions, too, and have a right not to have their sensibilities offended by @@ -53,7 +53,7 @@ a program which is supposed to be entert -o" or "fortune -a" are saying, in effect, that they are willing to have their sensibilities tweaked. However, they should not have their personal worth seriously (i.e., not in jest) assaulted. Jokes which depend for their -humor on racist, mysogynist, or homophobic stereotypes *do* seriously +humor on racist, misogynist, or homophobic stereotypes *do* seriously assault individual personal worth, and in a general entertainment medium we should be able to get by without it. Modified: head/games/fortune/datfiles/fortunes == --- head/games/fortune/datfiles/fortunesWed Mar 31 18:18:37 2010 (r205994) +++ head/games/fortune/datfiles/fortunesWed Mar 31 18:21:25 2010 (r205995) @@ -368,8 +368,10 @@ OR'd together, outta sight! Double bucky, I'd like a whole word of Double bucky, I'm happy I heard of Double bucky, I'd like a whole word of you! - - -- (C) 1978 by Guy L. Steele, Jr. + -- Guy L. Steele, Jr., (C) 1978 + (to Nicholas Wirth, who suggested that an extra bit + be added to terminal codes on 36-bit machines
svn commit: r205994 - head/tools/tools/nanobsd/gateworks
Author: imp
Date: Wed Mar 31 18:18:37 2010
New Revision: 205994
URL: http://svn.freebsd.org/changeset/base/205994
Log:
Two fixes:
(1) We don't need a custom install_kernel. We can install without
symbols by adding INSTALL_NODEBUG (which likely should be
WITHOUT_KERNEL_SYMBOLS_FILE, or something shorter) to CONF_INSTALL
(2) for make buildenv stage, use NANO_MAKE_CONF_BUILD rather than the
non-existant NANO_MAKE_CONF.
MFC after:7 days
Modified:
head/tools/tools/nanobsd/gateworks/common
Modified: head/tools/tools/nanobsd/gateworks/common
==
--- head/tools/tools/nanobsd/gateworks/common Wed Mar 31 17:47:57 2010
(r205993)
+++ head/tools/tools/nanobsd/gateworks/common Wed Mar 31 18:18:37 2010
(r205994)
@@ -37,7 +37,7 @@ NANO_CUSTOMIZE="$NANO_CUSTOMIZE cust_ins
buildenv()
{
cd ${NANO_SRC}
- env TARGET_ARCH=${NANO_ARCH} __MAKE_CONF=${NANO_MAKE_CONF} \
+ env TARGET_ARCH=${NANO_ARCH} __MAKE_CONF=${NANO_MAKE_CONF_BUILD} \
DESTDIR=${NANO_WORLDDIR} make buildenv
}
@@ -146,22 +146,9 @@ WITHOUT_TCSH=true
CONF_INSTALL="$CONF_BUILD
WITHOUT_TOOLCHAIN=true
WITHOUT_INSTALLLIB=true
+INSTALL_NODEBUG=true
"
-# NB: override to suppress install of kernel.symbols
-install_kernel()
-{
- pprint 2 "install kernel"
- pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.ik"
-
- cd ${NANO_SRC}
- env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \
- INSTALL_NODEBUG=true \
- DESTDIR=${NANO_WORLDDIR} \
- __MAKE_CONF=${NANO_MAKE_CONF} KERNCONF=`basename
${NANO_KERNEL}` \
- > ${MAKEOBJDIRPREFIX}/_.ik 2>&1
-}
-
# NB: override to force / on s1 instead of s1a
setup_nanobsd_etc()
{
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205993 - head/sys/cam
Author: mjacob
Date: Wed Mar 31 17:47:57 2010
New Revision: 205993
URL: http://svn.freebsd.org/changeset/base/205993
Log:
For unhandled actions in xpt_action_default, remember to call
xpt_done for queued requests. This solves the problem of
indefinite hangs for unspecified transports when XPT_SCAN_BUS
is called.
A few minor cosmetics elsewhere.
MFC after:1 week
Modified:
head/sys/cam/cam_xpt.c
Modified: head/sys/cam/cam_xpt.c
==
--- head/sys/cam/cam_xpt.c Wed Mar 31 17:40:13 2010(r205992)
+++ head/sys/cam/cam_xpt.c Wed Mar 31 17:47:57 2010(r205993)
@@ -2380,6 +2380,7 @@ xpt_action_default(union ccb *start_ccb)
if (start_ccb->ccb_h.func_code == XPT_ATA_IO) {
start_ccb->ataio.resid = 0;
}
+ /* FALLTHROUGH */
case XPT_RESET_DEV:
case XPT_ENG_EXEC:
{
@@ -2888,6 +2889,9 @@ xpt_action_default(union ccb *start_ccb)
case XPT_ENG_INQ:
/* XXX Implement */
start_ccb->ccb_h.status = CAM_PROVIDE_FAIL;
+ if (start_ccb->ccb_h.func_code & XPT_FC_DEV_QUEUED) {
+ xpt_done(start_ccb);
+ }
break;
}
}
@@ -3930,7 +3934,7 @@ xpt_dev_async_default(u_int32_t async_co
struct cam_et *target, struct cam_ed *device,
void *async_arg)
{
- printf("xpt_dev_async called\n");
+ printf("%s called\n", __func__);
}
u_int32_t
@@ -4919,4 +4923,3 @@ camisr_runqueue(void *V_queue)
(*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h);
}
}
-
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205992 - head/usr.bin/sed
Author: imp
Date: Wed Mar 31 17:40:13 2010
New Revision: 205992
URL: http://svn.freebsd.org/changeset/base/205992
Log:
Make -r mean exactly the same thing as -E for increased compatibility
with GNU sed.
MFC after:7 days
Modified:
head/usr.bin/sed/main.c
head/usr.bin/sed/sed.1
Modified: head/usr.bin/sed/main.c
==
--- head/usr.bin/sed/main.c Wed Mar 31 17:14:32 2010(r205991)
+++ head/usr.bin/sed/main.c Wed Mar 31 17:40:13 2010(r205992)
@@ -130,8 +130,9 @@ main(int argc, char *argv[])
fflag = 0;
inplace = NULL;
- while ((c = getopt(argc, argv, "EI:ae:f:i:ln")) != -1)
+ while ((c = getopt(argc, argv, "EI:ae:f:i:lnr")) != -1)
switch (c) {
+ case 'r': /* Gnu sed compat */
case 'E':
rflags = REG_EXTENDED;
break;
Modified: head/usr.bin/sed/sed.1
==
--- head/usr.bin/sed/sed.1 Wed Mar 31 17:14:32 2010(r205991)
+++ head/usr.bin/sed/sed.1 Wed Mar 31 17:40:13 2010(r205992)
@@ -39,11 +39,11 @@
.Nd stream editor
.Sh SYNOPSIS
.Nm
-.Op Fl Ealn
+.Op Fl Ealnr
.Ar command
.Op Ar
.Nm
-.Op Fl Ealn
+.Op Fl Ealnr
.Op Fl e Ar command
.Op Fl f Ar command_file
.Op Fl I Ar extension
@@ -144,6 +144,10 @@ all of the commands have been applied to
The
.Fl n
option suppresses this behavior.
+.It Fl r
+Same as
+.Fl E
+for compatibility with GNU sed.
.El
.Pp
The form of a
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205989 - head/usr.bin/indent
Author: avg
Date: Wed Mar 31 17:05:30 2010
New Revision: 205989
URL: http://svn.freebsd.org/changeset/base/205989
Log:
indent(1): add a new option, -ta, to treat all *_t identifiers as types
Submitted by: Hans Petter Selasky
Discussed with: bde
MFC after:10 days
Modified:
head/usr.bin/indent/args.c
head/usr.bin/indent/indent.1
head/usr.bin/indent/indent_globs.h
head/usr.bin/indent/lexi.c
Modified: head/usr.bin/indent/args.c
==
--- head/usr.bin/indent/args.c Wed Mar 31 16:55:47 2010(r205988)
+++ head/usr.bin/indent/args.c Wed Mar 31 17:05:30 2010(r205989)
@@ -157,6 +157,7 @@ struct pro {
{"sc", PRO_BOOL, true, ON, &star_comment_cont},
{"sob", PRO_BOOL, false, ON, &swallow_optional_blanklines},
{"st", PRO_SPECIAL, 0, STDIN, 0},
+{"ta", PRO_BOOL, false, ON, &auto_typedefs},
{"troff", PRO_BOOL, false, ON, &troff},
{"ut", PRO_BOOL, true, ON, &use_tabs},
{"v", PRO_BOOL, false, ON, &verbose},
Modified: head/usr.bin/indent/indent.1
==
--- head/usr.bin/indent/indent.1Wed Mar 31 16:55:47 2010
(r205988)
+++ head/usr.bin/indent/indent.1Wed Mar 31 17:05:30 2010
(r205989)
@@ -80,6 +80,7 @@
.Op Fl sob | Fl nsob
.Ek
.Op Fl \&st
+.Op Fl \&ta
.Op Fl troff
.Op Fl ut | Fl nut
.Op Fl v | Fl \&nv
@@ -377,6 +378,9 @@ Default:
Causes
.Nm
to take its input from stdin and put its output to stdout.
+.It Fl ta
+Automatically add all identifiers ending in "_t" to the list
+of type keywords.
.It Fl T Ns Ar typename
Adds
.Ar typename
Modified: head/usr.bin/indent/indent_globs.h
==
--- head/usr.bin/indent/indent_globs.h Wed Mar 31 16:55:47 2010
(r205988)
+++ head/usr.bin/indent/indent_globs.h Wed Mar 31 17:05:30 2010
(r205989)
@@ -204,6 +204,8 @@ int function_brace_split; /* split f
* brace onto separate lines */
intuse_tabs; /* set true to use tabs for spacing,
* false uses all spaces */
+intauto_typedefs; /* set true to recognize identifiers
+* ending in "_t" like typedefs */
/* -troff font state information */
Modified: head/usr.bin/indent/lexi.c
==
--- head/usr.bin/indent/lexi.c Wed Mar 31 16:55:47 2010(r205988)
+++ head/usr.bin/indent/lexi.c Wed Mar 31 17:05:30 2010(r205989)
@@ -249,6 +249,17 @@ lexi(void)
last_code = ident; /* Remember that this is the code we will
* return */
+ if (auto_typedefs) {
+ const char *q = s_token;
+ /* Check if we have an "_t" in the end */
+ if (q[0] && q[1] &&
+ (strcmp(q + strlen(q) - 2, "_t") == 0)) {
+ ps.its_a_keyword = true;
+ ps.last_u_d = true;
+ goto found_auto_typedef;
+ }
+ }
+
/*
* This loop will check if the token is a keyword.
*/
@@ -285,6 +296,7 @@ lexi(void)
/* FALLTHROUGH */
case 4: /* one of the declaration keywords */
+ found_auto_typedef:
if (ps.p_l_follow) {
ps.cast_mask |= (1 << ps.p_l_follow) & ~ps.sizeof_mask;
break; /* inside parens: cast, param list or sizeof */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205988 - head/usr.bin/indent
Author: avg
Date: Wed Mar 31 16:55:47 2010
New Revision: 205988
URL: http://svn.freebsd.org/changeset/base/205988
Log:
indent(1): correctly handle case/label at the very start of a function
Obtained from:NetBSD (rev. 1.11 of indent.c)
MFC after:1 week
Modified:
head/usr.bin/indent/indent.c
Modified: head/usr.bin/indent/indent.c
==
--- head/usr.bin/indent/indent.cWed Mar 31 16:42:22 2010
(r205987)
+++ head/usr.bin/indent/indent.cWed Mar 31 16:55:47 2010
(r205988)
@@ -675,7 +675,7 @@ check_type:
ps.want_blank = true;
break;
}
- if (ps.in_decl) {
+ if (ps.in_or_st) {
*e_code++ = ':';
ps.want_blank = false;
break;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205987 - head/sys/dev/e1000
Author: jfv Date: Wed Mar 31 16:42:22 2010 New Revision: 205987 URL: http://svn.freebsd.org/changeset/base/205987 Log: Fix poll handler declaration. Modified: head/sys/dev/e1000/if_lem.c Modified: head/sys/dev/e1000/if_lem.c == --- head/sys/dev/e1000/if_lem.c Wed Mar 31 16:07:36 2010(r205986) +++ head/sys/dev/e1000/if_lem.c Wed Mar 31 16:42:22 2010(r205987) @@ -269,7 +269,7 @@ static void lem_add_rx_process_limit(str #endif /* ~EM_LEGACY_IRQ */ #ifdef DEVICE_POLLING -static poll_handler_t em_poll; +static poll_handler_t lem_poll; #endif /* POLLING */ /* ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205986 - head/sys/net80211
Author: rpaulo
Date: Wed Mar 31 16:07:36 2010
New Revision: 205986
URL: http://svn.freebsd.org/changeset/base/205986
Log:
Constify vap argument of ieee80211_{note,discard}* functions.
MFC after:1 week
Modified:
head/sys/net80211/ieee80211_input.c
head/sys/net80211/ieee80211_var.h
Modified: head/sys/net80211/ieee80211_input.c
==
--- head/sys/net80211/ieee80211_input.c Wed Mar 31 16:01:48 2010
(r205985)
+++ head/sys/net80211/ieee80211_input.c Wed Mar 31 16:07:36 2010
(r205986)
@@ -734,7 +734,8 @@ ieee80211_ssid_mismatch(struct ieee80211
* Return the bssid of a frame.
*/
static const uint8_t *
-ieee80211_getbssid(struct ieee80211vap *vap, const struct ieee80211_frame *wh)
+ieee80211_getbssid(const struct ieee80211vap *vap,
+ const struct ieee80211_frame *wh)
{
if (vap->iv_opmode == IEEE80211_M_STA)
return wh->i_addr2;
@@ -748,7 +749,7 @@ ieee80211_getbssid(struct ieee80211vap *
#include
void
-ieee80211_note(struct ieee80211vap *vap, const char *fmt, ...)
+ieee80211_note(const struct ieee80211vap *vap, const char *fmt, ...)
{
char buf[128]; /* XXX */
va_list ap;
@@ -761,7 +762,7 @@ ieee80211_note(struct ieee80211vap *vap,
}
void
-ieee80211_note_frame(struct ieee80211vap *vap,
+ieee80211_note_frame(const struct ieee80211vap *vap,
const struct ieee80211_frame *wh,
const char *fmt, ...)
{
@@ -776,7 +777,7 @@ ieee80211_note_frame(struct ieee80211vap
}
void
-ieee80211_note_mac(struct ieee80211vap *vap,
+ieee80211_note_mac(const struct ieee80211vap *vap,
const uint8_t mac[IEEE80211_ADDR_LEN],
const char *fmt, ...)
{
@@ -790,7 +791,7 @@ ieee80211_note_mac(struct ieee80211vap *
}
void
-ieee80211_discard_frame(struct ieee80211vap *vap,
+ieee80211_discard_frame(const struct ieee80211vap *vap,
const struct ieee80211_frame *wh,
const char *type, const char *fmt, ...)
{
@@ -811,7 +812,7 @@ ieee80211_discard_frame(struct ieee80211
}
void
-ieee80211_discard_ie(struct ieee80211vap *vap,
+ieee80211_discard_ie(const struct ieee80211vap *vap,
const struct ieee80211_frame *wh,
const char *type, const char *fmt, ...)
{
@@ -830,7 +831,7 @@ ieee80211_discard_ie(struct ieee80211vap
}
void
-ieee80211_discard_mac(struct ieee80211vap *vap,
+ieee80211_discard_mac(const struct ieee80211vap *vap,
const uint8_t mac[IEEE80211_ADDR_LEN],
const char *type, const char *fmt, ...)
{
Modified: head/sys/net80211/ieee80211_var.h
==
--- head/sys/net80211/ieee80211_var.h Wed Mar 31 16:01:48 2010
(r205985)
+++ head/sys/net80211/ieee80211_var.h Wed Mar 31 16:07:36 2010
(r205986)
@@ -852,10 +852,10 @@ ieee80211_htchanflags(const struct ieee8
if (ieee80211_msg(_vap, _m))\
ieee80211_note_frame(_vap, _wh, _fmt, __VA_ARGS__); \
} while (0)
-void ieee80211_note(struct ieee80211vap *, const char *, ...);
-void ieee80211_note_mac(struct ieee80211vap *,
+void ieee80211_note(const struct ieee80211vap *, const char *, ...);
+void ieee80211_note_mac(const struct ieee80211vap *,
const uint8_t mac[IEEE80211_ADDR_LEN], const char *, ...);
-void ieee80211_note_frame(struct ieee80211vap *,
+void ieee80211_note_frame(const struct ieee80211vap *,
const struct ieee80211_frame *, const char *, ...);
#defineieee80211_msg_debug(_vap) \
((_vap)->iv_debug & IEEE80211_MSG_DEBUG)
@@ -893,11 +893,11 @@ void ieee80211_note_frame(struct ieee802
ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\
} while (0)
-void ieee80211_discard_frame(struct ieee80211vap *,
+void ieee80211_discard_frame(const struct ieee80211vap *,
const struct ieee80211_frame *, const char *type, const char *fmt, ...);
-void ieee80211_discard_ie(struct ieee80211vap *,
+void ieee80211_discard_ie(const struct ieee80211vap *,
const struct ieee80211_frame *, const char *type, const char *fmt, ...);
-void ieee80211_discard_mac(struct ieee80211vap *,
+void ieee80211_discard_mac(const struct ieee80211vap *,
const uint8_t mac[IEEE80211_ADDR_LEN], const char *type,
const char *fmt, ...);
#else
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205980 - head/tools/tools/nanobsd
Author: imp
Date: Wed Mar 31 14:42:07 2010
New Revision: 205980
URL: http://svn.freebsd.org/changeset/base/205980
Log:
Stop hard coding i386 as the arch for the build. Instead, default to the
processor we're running on. Also, supply amd64 version of create_diskimage
that's the same as i386's.
# didn't fix the confusion between using the processor for this and using
# the machine (which would be more appropriate). NANO_ARCH smashes the two
# together right now.
MFC after:7 days
Modified:
head/tools/tools/nanobsd/nanobsd.sh
Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Wed Mar 31 13:51:31 2010
(r205979)
+++ head/tools/tools/nanobsd/nanobsd.sh Wed Mar 31 14:42:07 2010
(r205980)
@@ -134,7 +134,7 @@ PPLEVEL=3
###
# Not a variable at this time
-NANO_ARCH=i386
+NANO_ARCH=`uname -p`
###
#
@@ -497,6 +497,11 @@ create_i386_diskimage ( ) (
) > ${NANO_OBJ}/_.di 2>&1
)
+# i386 and amd64 are identical for disk images
+create_amd64_diskimage ( ) (
+ create_i386_diskimage
+)
+
last_orders () (
# Redefine this function with any last orders you may have
# after the build completed, for instance to copy the finished
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205978 - head/share/man/man7
Author: keramida (doc committer) Date: Wed Mar 31 12:52:19 2010 New Revision: 205978 URL: http://svn.freebsd.org/changeset/base/205978 Log: Document DEBUG_FLAGS in a more visible place, in the build(7) manpage Noticed by: Alexander Best Reviewed by:jhb MFC after: 1 week Modified: head/share/man/man7/build.7 Modified: head/share/man/man7/build.7 == --- head/share/man/man7/build.7 Wed Mar 31 12:22:55 2010(r205977) +++ head/share/man/man7/build.7 Wed Mar 31 12:52:19 2010(r205978) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 15, 2009 +.Dd March 31, 2010 .Dt BUILD 7 .Os .Sh NAME @@ -311,6 +311,20 @@ should be set as with .Sh ENVIRONMENT Variables that influence all builds include: .Bl -tag -width ".Va MAKEOBJDIRPREFIX" +.It Va DEBUG_FLAGS +Defines a set of debugging flags that will be used to build all userland +binaries under +.Pa /usr/src . +When +.Va DEBUG_FLAGS +is defined, the +.Cm install +and +.Cm installworld +targets install binaries from the current +.Va MAKEOBJDIRPREFIX +without stripping, +so that debugging information is retained in the installed binaries. .It Va DESTDIR The directory hierarchy prefix where built objects will be installed. If not set, ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r205967 - head/sys/dev/ata
Author: mav Date: Wed Mar 31 07:20:10 2010 New Revision: 205967 URL: http://svn.freebsd.org/changeset/base/205967 Log: Include opt_ata.h, as some structures here depending on ATA_CAM option. This fixes ATA_CAM with atamvsata and probably some other drivers. Modified: head/sys/dev/ata/ata-all.h Modified: head/sys/dev/ata/ata-all.h == --- head/sys/dev/ata/ata-all.h Wed Mar 31 07:12:12 2010(r205966) +++ head/sys/dev/ata/ata-all.h Wed Mar 31 07:20:10 2010(r205967) @@ -26,6 +26,8 @@ * $FreeBSD$ */ +#include "opt_ata.h" + #if 0 #defineATA_LEGACY_SUPPORT /* Enable obsolete features that break * some modern devices */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
