diff options
| author | ian <ian@FreeBSD.org> | 2015-05-23 22:33:06 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-05-23 22:33:06 +0000 |
| commit | a17d85346eb7a3b17edfabe882edaf935909a3c7 (patch) | |
| tree | f04f99a4dbce012d0dc3862b563ab41910fd8f4a /sys/arm | |
| parent | 0c377e52af241168e3d1425b1a8a4e0cbaf0af25 (diff) | |
| download | FreeBSD-src-a17d85346eb7a3b17edfabe882edaf935909a3c7.zip FreeBSD-src-a17d85346eb7a3b17edfabe882edaf935909a3c7.tar.gz | |
MFC r274249, r274484, r275583:
Avoid panic in ofwbus caused by not released resource list entry
Fix typo in ARM GIC device_printf()
Fix buffer overflow in Marvell PCI/PCIe driver
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/gic.c | 2 | ||||
| -rw-r--r-- | sys/arm/mv/mv_pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index 265c6e7..4e7f3bb 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -273,7 +273,7 @@ arm_gic_attach(device_t dev) arm_config_irq = gic_config_irq; icciidr = gic_c_read_4(GICC_IIDR); - device_printf(dev,"pn 0x%x, arch 0x%x, rev 0x%x, implementer 0x%x sc->nirqs %u\n", + device_printf(dev,"pn 0x%x, arch 0x%x, rev 0x%x, implementer 0x%x irqs %u\n", icciidr>>20, (icciidr>>16) & 0xF, (icciidr>>12) & 0xf, (icciidr & 0xfff), sc->nirqs); diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c index 012b31b..8ac6c76 100644 --- a/sys/arm/mv/mv_pci.c +++ b/sys/arm/mv/mv_pci.c @@ -1171,7 +1171,7 @@ mv_pcib_alloc_msi(device_t dev, device_t child, int count, for (i = start; i < start + count; i++) { setbit(&sc->sc_msi_bitmap, i); - irqs[i] = MSI_IRQ + i; + *irqs++ = MSI_IRQ + i; } debugf("%s: start: %x count: %x\n", __func__, start, count); |
