svn commit: r265999 - in stable/10/sys: arm/at91 arm/econa arm/s3c2xx0 arm/sa11x0 arm/xscale/i80321 arm/xscale/pxa dev/acpica dev/altera/atse dev/altera/avgen dev/altera/jtag_uart dev/altera/sdcard...
Ian Lepore
ian at FreeBSD.org
Wed May 14 01:35:54 UTC 2014
Author: ian
Date: Wed May 14 01:35:43 2014
New Revision: 265999
URL: http://svnweb.freebsd.org/changeset/base/265999
Log:
MFC r257334, r257336, r257337, r257338, r257341, r257342, r257343, r257370,
r257368, r257416
Hints-only devices should return BUS_PROBE_NOWILDCARD from their probe
methods.
Modified:
stable/10/sys/arm/at91/at91.c
stable/10/sys/arm/econa/econa.c
stable/10/sys/arm/s3c2xx0/s3c24x0.c
stable/10/sys/arm/sa11x0/sa11x0.c
stable/10/sys/arm/xscale/i80321/iq80321.c
stable/10/sys/arm/xscale/pxa/pxa_obio.c
stable/10/sys/dev/acpica/acpi.c
stable/10/sys/dev/altera/atse/if_atse_nexus.c
stable/10/sys/dev/altera/avgen/altera_avgen_nexus.c
stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
stable/10/sys/dev/altera/sdcard/altera_sdcard_nexus.c
stable/10/sys/dev/cfe/cfe_resource.c
stable/10/sys/dev/gxemul/disk/gxemul_disk.c
stable/10/sys/dev/gxemul/ether/if_gx.c
stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
stable/10/sys/dev/rt/if_rt.c
stable/10/sys/dev/terasic/de4led/terasic_de4led_nexus.c
stable/10/sys/dev/terasic/mtl/terasic_mtl_nexus.c
stable/10/sys/dev/xen/console/console.c
stable/10/sys/dev/xen/pcifront/pcifront.c
stable/10/sys/dev/xen/timer/timer.c
stable/10/sys/mips/adm5120/obio.c
stable/10/sys/mips/alchemy/obio.c
stable/10/sys/mips/atheros/apb.c
stable/10/sys/mips/atheros/ar71xx_ehci.c
stable/10/sys/mips/atheros/ar71xx_pci.c
stable/10/sys/mips/atheros/ar71xx_spi.c
stable/10/sys/mips/atheros/ar71xx_wdog.c
stable/10/sys/mips/atheros/ar724x_pci.c
stable/10/sys/mips/atheros/if_arge.c
stable/10/sys/mips/cavium/ciu.c
stable/10/sys/mips/cavium/octeon_ebt3000_cf.c
stable/10/sys/mips/cavium/octeon_pmc.c
stable/10/sys/mips/cavium/octeon_rnd.c
stable/10/sys/mips/cavium/octeon_rtc.c
stable/10/sys/mips/idt/obio.c
stable/10/sys/mips/malta/gt.c
stable/10/sys/mips/mips/tick.c
stable/10/sys/mips/nlm/tick.c
stable/10/sys/mips/nlm/xlp_pci.c
stable/10/sys/mips/rmi/iodi.c
stable/10/sys/mips/rmi/tick.c
stable/10/sys/mips/rt305x/obio.c
stable/10/sys/mips/sibyte/sb_zbbus.c
stable/10/sys/modules/Makefile
stable/10/sys/powerpc/pseries/plpar_iommu.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/at91/at91.c
==============================================================================
--- stable/10/sys/arm/at91/at91.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/arm/at91/at91.c Wed May 14 01:35:43 2014 (r265999)
@@ -232,8 +232,7 @@ at91_probe(device_t dev)
{
device_set_desc(dev, "AT91 device bus");
- arm_post_filter = at91_eoi;
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
@@ -262,6 +261,8 @@ at91_attach(device_t dev)
const struct arm_devmap_entry *pdevmap;
int i;
+ arm_post_filter = at91_eoi;
+
at91_softc = sc;
sc->sc_st = &at91_bs_tag;
sc->sc_sh = AT91_BASE;
Modified: stable/10/sys/arm/econa/econa.c
==============================================================================
--- stable/10/sys/arm/econa/econa.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/arm/econa/econa.c Wed May 14 01:35:43 2014 (r265999)
@@ -172,7 +172,7 @@ econa_probe(device_t dev)
{
device_set_desc(dev, "ECONA device bus");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/arm/s3c2xx0/s3c24x0.c
==============================================================================
--- stable/10/sys/arm/s3c2xx0/s3c24x0.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/arm/s3c2xx0/s3c24x0.c Wed May 14 01:35:43 2014 (r265999)
@@ -429,7 +429,7 @@ s3c24x0_identify(driver_t *driver, devic
int
s3c24x0_probe(device_t dev)
{
- return 0;
+ return (BUS_PROBE_NOWILDCARD);
}
int
Modified: stable/10/sys/arm/sa11x0/sa11x0.c
==============================================================================
--- stable/10/sys/arm/sa11x0/sa11x0.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/arm/sa11x0/sa11x0.c Wed May 14 01:35:43 2014 (r265999)
@@ -139,7 +139,7 @@ extern vm_offset_t saipic_base;
int
sa11x0_probe(device_t dev)
{
- return 0;
+ return (BUS_PROBE_NOWILDCARD);
}
void
Modified: stable/10/sys/arm/xscale/i80321/iq80321.c
==============================================================================
--- stable/10/sys/arm/xscale/i80321/iq80321.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/arm/xscale/i80321/iq80321.c Wed May 14 01:35:43 2014 (r265999)
@@ -72,7 +72,7 @@ int
iq80321_probe(device_t dev)
{
device_set_desc(dev, "Intel 80321");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
void
Modified: stable/10/sys/arm/xscale/pxa/pxa_obio.c
==============================================================================
--- stable/10/sys/arm/xscale/pxa/pxa_obio.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/arm/xscale/pxa/pxa_obio.c Wed May 14 01:35:43 2014 (r265999)
@@ -92,7 +92,7 @@ pxa_probe(device_t dev)
{
device_set_desc(dev, "XScale PXA On-board IO");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
int
Modified: stable/10/sys/dev/acpica/acpi.c
==============================================================================
--- stable/10/sys/dev/acpica/acpi.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/acpica/acpi.c Wed May 14 01:35:43 2014 (r265999)
@@ -431,7 +431,7 @@ acpi_probe(device_t dev)
device_set_desc(dev, acpi_desc);
- return_VALUE (0);
+ return_VALUE (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/altera/atse/if_atse_nexus.c
==============================================================================
--- stable/10/sys/dev/altera/atse/if_atse_nexus.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/altera/atse/if_atse_nexus.c Wed May 14 01:35:43 2014 (r265999)
@@ -129,7 +129,7 @@ atse_probe_nexus(device_t dev)
/* Success. */
device_set_desc(dev, "Altera Triple-Speed Ethernet MegaCore");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/altera/avgen/altera_avgen_nexus.c
==============================================================================
--- stable/10/sys/dev/altera/avgen/altera_avgen_nexus.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/altera/avgen/altera_avgen_nexus.c Wed May 14 01:35:43 2014 (r265999)
@@ -58,7 +58,7 @@ altera_avgen_nexus_probe(device_t dev)
{
device_set_desc(dev, "Generic Altera Avalon device attachment");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
==============================================================================
--- stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c Wed May 14 01:35:43 2014 (r265999)
@@ -62,7 +62,7 @@ altera_jtag_uart_nexus_probe(device_t de
{
device_set_desc(dev, "Altera JTAG UART");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/altera/sdcard/altera_sdcard_nexus.c
==============================================================================
--- stable/10/sys/dev/altera/sdcard/altera_sdcard_nexus.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/altera/sdcard/altera_sdcard_nexus.c Wed May 14 01:35:43 2014 (r265999)
@@ -62,7 +62,7 @@ altera_sdcard_nexus_probe(device_t dev)
{
device_set_desc(dev, "Altera Secure Data Card IP Core");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/cfe/cfe_resource.c
==============================================================================
--- stable/10/sys/dev/cfe/cfe_resource.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/cfe/cfe_resource.c Wed May 14 01:35:43 2014 (r265999)
@@ -61,7 +61,7 @@ static int
cferes_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/gxemul/disk/gxemul_disk.c
==============================================================================
--- stable/10/sys/dev/gxemul/disk/gxemul_disk.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/gxemul/disk/gxemul_disk.c Wed May 14 01:35:43 2014 (r265999)
@@ -158,7 +158,7 @@ gxemul_disk_probe(device_t dev)
{
device_set_desc(dev, "GXemul test disk");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/dev/gxemul/ether/if_gx.c
==============================================================================
--- stable/10/sys/dev/gxemul/ether/if_gx.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/gxemul/ether/if_gx.c Wed May 14 01:35:43 2014 (r265999)
@@ -125,7 +125,7 @@ gx_probe(device_t dev)
device_set_desc(dev, "GXemul test Ethernet");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Wed May 14 01:35:43 2014 (r265999)
@@ -313,7 +313,7 @@ vmbus_probe(device_t dev) {
device_set_desc(dev, "Vmbus Devices");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
/**
Modified: stable/10/sys/dev/rt/if_rt.c
==============================================================================
--- stable/10/sys/dev/rt/if_rt.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/rt/if_rt.c Wed May 14 01:35:43 2014 (r265999)
@@ -148,7 +148,7 @@ static int
rt_probe(device_t dev)
{
device_set_desc(dev, "Ralink RT305XF onChip Ethernet MAC");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
/*
Modified: stable/10/sys/dev/terasic/de4led/terasic_de4led_nexus.c
==============================================================================
--- stable/10/sys/dev/terasic/de4led/terasic_de4led_nexus.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/terasic/de4led/terasic_de4led_nexus.c Wed May 14 01:35:43 2014 (r265999)
@@ -58,7 +58,7 @@ terasic_de4led_nexus_probe(device_t dev)
{
device_set_desc(dev, "Terasic DE4 8-element LED");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/terasic/mtl/terasic_mtl_nexus.c
==============================================================================
--- stable/10/sys/dev/terasic/mtl/terasic_mtl_nexus.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/terasic/mtl/terasic_mtl_nexus.c Wed May 14 01:35:43 2014 (r265999)
@@ -55,7 +55,7 @@ terasic_mtl_nexus_probe(device_t dev)
{
device_set_desc(dev, "Terasic Multi-touch LCD (MTL)");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/xen/console/console.c
==============================================================================
--- stable/10/sys/dev/xen/console/console.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/xen/console/console.c Wed May 14 01:35:43 2014 (r265999)
@@ -226,7 +226,7 @@ static int
xc_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/dev/xen/pcifront/pcifront.c
==============================================================================
--- stable/10/sys/dev/xen/pcifront/pcifront.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/xen/pcifront/pcifront.c Wed May 14 01:35:43 2014 (r265999)
@@ -441,7 +441,7 @@ xpcife_probe(device_t dev)
struct pcifront_device *pdev = (struct pcifront_device *)device_get_ivars(dev);
DPRINTF("xpcife probe (unit=%d)\n", pdev->unit);
#endif
- return 0;
+ return (BUS_PROBE_NOWILDCARD);
}
/* Newbus xpcife device driver attach */
Modified: stable/10/sys/dev/xen/timer/timer.c
==============================================================================
--- stable/10/sys/dev/xen/timer/timer.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/dev/xen/timer/timer.c Wed May 14 01:35:43 2014 (r265999)
@@ -142,7 +142,7 @@ xentimer_probe(device_t dev)
"VCPUOPs interface unavailable\n");
#undef XTREQUIRES
device_set_desc(dev, "Xen PV Clock");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
/*
Modified: stable/10/sys/mips/adm5120/obio.c
==============================================================================
--- stable/10/sys/mips/adm5120/obio.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/adm5120/obio.c Wed May 14 01:35:43 2014 (r265999)
@@ -157,7 +157,7 @@ static int
obio_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/alchemy/obio.c
==============================================================================
--- stable/10/sys/mips/alchemy/obio.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/alchemy/obio.c Wed May 14 01:35:43 2014 (r265999)
@@ -158,7 +158,7 @@ static int
obio_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/atheros/apb.c
==============================================================================
--- stable/10/sys/mips/atheros/apb.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/atheros/apb.c Wed May 14 01:35:43 2014 (r265999)
@@ -103,7 +103,7 @@ static int
apb_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/atheros/ar71xx_ehci.c
==============================================================================
--- stable/10/sys/mips/atheros/ar71xx_ehci.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/atheros/ar71xx_ehci.c Wed May 14 01:35:43 2014 (r265999)
@@ -75,7 +75,7 @@ ar71xx_ehci_probe(device_t self)
device_set_desc(self, EHCI_HC_DEVSTR);
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- stable/10/sys/mips/atheros/ar71xx_pci.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/atheros/ar71xx_pci.c Wed May 14 01:35:43 2014 (r265999)
@@ -371,7 +371,7 @@ static int
ar71xx_pci_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/atheros/ar71xx_spi.c
==============================================================================
--- stable/10/sys/mips/atheros/ar71xx_spi.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/atheros/ar71xx_spi.c Wed May 14 01:35:43 2014 (r265999)
@@ -84,7 +84,7 @@ static int
ar71xx_spi_probe(device_t dev)
{
device_set_desc(dev, "AR71XX SPI");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/atheros/ar71xx_wdog.c
==============================================================================
--- stable/10/sys/mips/atheros/ar71xx_wdog.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/atheros/ar71xx_wdog.c Wed May 14 01:35:43 2014 (r265999)
@@ -92,7 +92,7 @@ ar71xx_wdog_probe(device_t dev)
{
device_set_desc(dev, "Atheros AR71XX watchdog timer");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/mips/atheros/ar724x_pci.c
==============================================================================
--- stable/10/sys/mips/atheros/ar724x_pci.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/atheros/ar724x_pci.c Wed May 14 01:35:43 2014 (r265999)
@@ -349,7 +349,7 @@ static int
ar724x_pci_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/atheros/if_arge.c
==============================================================================
--- stable/10/sys/mips/atheros/if_arge.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/atheros/if_arge.c Wed May 14 01:35:43 2014 (r265999)
@@ -260,7 +260,7 @@ arge_probe(device_t dev)
{
device_set_desc(dev, "Atheros AR71xx built-in ethernet interface");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/mips/cavium/ciu.c
==============================================================================
--- stable/10/sys/mips/cavium/ciu.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/cavium/ciu.c Wed May 14 01:35:43 2014 (r265999)
@@ -109,7 +109,7 @@ ciu_probe(device_t dev)
return (ENXIO);
device_set_desc(dev, "Cavium Octeon Central Interrupt Unit");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/cavium/octeon_ebt3000_cf.c
==============================================================================
--- stable/10/sys/mips/cavium/octeon_ebt3000_cf.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/cavium/octeon_ebt3000_cf.c Wed May 14 01:35:43 2014 (r265999)
@@ -599,7 +599,7 @@ static int cf_probe (device_t dev)
device_set_desc(dev, "Octeon Compact Flash Driver");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
/* ------------------------------------------------------------------- *
Modified: stable/10/sys/mips/cavium/octeon_pmc.c
==============================================================================
--- stable/10/sys/mips/cavium/octeon_pmc.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/cavium/octeon_pmc.c Wed May 14 01:35:43 2014 (r265999)
@@ -71,7 +71,7 @@ octeon_pmc_probe(device_t dev)
return (ENXIO);
device_set_desc(dev, "Cavium Octeon Performance Counters");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/cavium/octeon_rnd.c
==============================================================================
--- stable/10/sys/mips/cavium/octeon_rnd.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/cavium/octeon_rnd.c Wed May 14 01:35:43 2014 (r265999)
@@ -86,7 +86,7 @@ octeon_rnd_probe(device_t dev)
return (ENXIO);
device_set_desc(dev, "Cavium Octeon Random Number Generator");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/cavium/octeon_rtc.c
==============================================================================
--- stable/10/sys/mips/cavium/octeon_rtc.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/cavium/octeon_rtc.c Wed May 14 01:35:43 2014 (r265999)
@@ -81,7 +81,7 @@ octeon_rtc_probe(device_t dev)
return (ENXIO);
device_set_desc(dev, "Cavium Octeon Realtime Clock");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/idt/obio.c
==============================================================================
--- stable/10/sys/mips/idt/obio.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/idt/obio.c Wed May 14 01:35:43 2014 (r265999)
@@ -108,7 +108,7 @@ static int
obio_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/malta/gt.c
==============================================================================
--- stable/10/sys/mips/malta/gt.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/malta/gt.c Wed May 14 01:35:43 2014 (r265999)
@@ -51,7 +51,7 @@ static int
gt_probe(device_t dev)
{
device_set_desc(dev, "GT64120 chip");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/mips/mips/tick.c
==============================================================================
--- stable/10/sys/mips/mips/tick.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/mips/tick.c Wed May 14 01:35:43 2014 (r265999)
@@ -313,7 +313,7 @@ clock_probe(device_t dev)
panic("can't attach more clocks");
device_set_desc(dev, "Generic MIPS32 ticker");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/mips/nlm/tick.c
==============================================================================
--- stable/10/sys/mips/nlm/tick.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/nlm/tick.c Wed May 14 01:35:43 2014 (r265999)
@@ -318,7 +318,7 @@ clock_probe(device_t dev)
panic("can't attach more clocks");
device_set_desc(dev, "Generic MIPS32 ticker");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/mips/nlm/xlp_pci.c
==============================================================================
--- stable/10/sys/mips/nlm/xlp_pci.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/nlm/xlp_pci.c Wed May 14 01:35:43 2014 (r265999)
@@ -383,8 +383,7 @@ xlp_pcib_probe(device_t dev)
{
device_set_desc(dev, "XLP PCI bus");
- xlp_pcib_init_resources();
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
@@ -524,6 +523,8 @@ xlp_pcib_attach(device_t dev)
{
int node, link;
+ xlp_pcib_init_resources();
+
/* enable hardware swap on all nodes/links */
for (node = 0; node < XLP_MAX_NODES; node++)
for (link = 0; link < 4; link++)
Modified: stable/10/sys/mips/rmi/iodi.c
==============================================================================
--- stable/10/sys/mips/rmi/iodi.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/rmi/iodi.c Wed May 14 01:35:43 2014 (r265999)
@@ -190,7 +190,7 @@ static void iodi_identify(driver_t *, de
int
iodi_probe(device_t dev)
{
- return 0;
+ return (BUS_PROBE_NOWILDCARD);
}
void
Modified: stable/10/sys/mips/rmi/tick.c
==============================================================================
--- stable/10/sys/mips/rmi/tick.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/rmi/tick.c Wed May 14 01:35:43 2014 (r265999)
@@ -315,7 +315,7 @@ clock_probe(device_t dev)
panic("can't attach more clocks");
device_set_desc(dev, "Generic MIPS32 ticker");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static void
Modified: stable/10/sys/mips/rt305x/obio.c
==============================================================================
--- stable/10/sys/mips/rt305x/obio.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/rt305x/obio.c Wed May 14 01:35:43 2014 (r265999)
@@ -148,7 +148,7 @@ static int
obio_probe(device_t dev)
{
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/mips/sibyte/sb_zbbus.c
==============================================================================
--- stable/10/sys/mips/sibyte/sb_zbbus.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/mips/sibyte/sb_zbbus.c Wed May 14 01:35:43 2014 (r265999)
@@ -207,7 +207,7 @@ zbbus_probe(device_t dev)
{
device_set_desc(dev, "Broadcom/Sibyte ZBbus");
- return (0);
+ return (BUS_PROBE_NOWILDCARD);
}
static int
Modified: stable/10/sys/modules/Makefile
==============================================================================
--- stable/10/sys/modules/Makefile Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/modules/Makefile Wed May 14 01:35:43 2014 (r265999)
@@ -2,6 +2,8 @@
.include <bsd.own.mk>
+SUBDIR_PARALLEL=
+
# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).
Modified: stable/10/sys/powerpc/pseries/plpar_iommu.c
==============================================================================
--- stable/10/sys/powerpc/pseries/plpar_iommu.c Wed May 14 01:16:05 2014 (r265998)
+++ stable/10/sys/powerpc/pseries/plpar_iommu.c Wed May 14 01:35:43 2014 (r265999)
@@ -69,7 +69,7 @@ struct dma_window {
};
int
-phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag)
+phyp_iommu_set_dma_tag(device_t bus, device_t dev, bus_dma_tag_t tag)
{
device_t p;
phandle_t node;
@@ -77,7 +77,7 @@ phyp_iommu_set_dma_tag(device_t dev, dev
struct iommu_map *i;
int cell;
- for (p = child; p != NULL; p = device_get_parent(p)) {
+ for (p = dev; device_get_parent(p) != NULL; p = device_get_parent(p)) {
if (ofw_bus_has_prop(p, "ibm,my-dma-window"))
break;
if (ofw_bus_has_prop(p, "ibm,dma-window"))
@@ -150,7 +150,7 @@ phyp_iommu_set_dma_tag(device_t dev, dev
papr_supports_stuff_tce = !(phyp_hcall(H_STUFF_TCE,
window->map->iobn, 0, 0, 0) == H_FUNCTION);
- bus_dma_tag_set_iommu(tag, dev, window);
+ bus_dma_tag_set_iommu(tag, bus, window);
return (0);
}
More information about the svn-src-stable
mailing list