diff --git a/sys/dev/sec/sec.c b/sys/dev/sec/sec.c index 65ce014adcb8..6b0a62f9e9fa 100644 --- a/sys/dev/sec/sec.c +++ b/sys/dev/sec/sec.c @@ -58,7 +58,7 @@ static int sec_attach(device_t dev); static int sec_detach(device_t dev); static int sec_suspend(device_t dev); static int sec_resume(device_t dev); -static void sec_shutdown(device_t dev); +static int sec_shutdown(device_t dev); static void sec_primary_intr(void *arg); static void sec_secondary_intr(void *arg); static int sec_setup_intr(struct sec_softc *sc, struct resource **ires, @@ -500,9 +500,11 @@ sec_resume(device_t dev) return (0); } -static void +static int sec_shutdown(device_t dev) { + + return (0); } static int diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c index 3676cfca9a3b..23ed34e49cba 100644 --- a/sys/dev/tsec/if_tsec.c +++ b/sys/dev/tsec/if_tsec.c @@ -313,7 +313,7 @@ tsec_detach(struct tsec_softc *sc) return (0); } -void +int tsec_shutdown(device_t dev) { struct tsec_softc *sc; @@ -323,6 +323,7 @@ tsec_shutdown(device_t dev) TSEC_GLOBAL_LOCK(sc); tsec_stop(sc); TSEC_GLOBAL_UNLOCK(sc); + return (0); } int @@ -1582,7 +1583,7 @@ tsec_miibus_readreg(device_t dev, int phy, int reg) return (TSEC_READ(sc, TSEC_REG_MIIMSTAT)); } -void +int tsec_miibus_writereg(device_t dev, int phy, int reg, int value) { struct tsec_softc *sc; @@ -1606,6 +1607,8 @@ tsec_miibus_writereg(device_t dev, int phy, int reg, int value) if (timeout == 0) device_printf(dev, "Timeout while writing to PHY!\n"); + + return (0); } void diff --git a/sys/dev/tsec/if_tsec.h b/sys/dev/tsec/if_tsec.h index 55b1e4f5110a..a0ac722b681b 100644 --- a/sys/dev/tsec/if_tsec.h +++ b/sys/dev/tsec/if_tsec.h @@ -358,10 +358,10 @@ void tsec_receive_intr(void *arg); void tsec_transmit_intr(void *arg); int tsec_miibus_readreg(device_t dev, int phy, int reg); -void tsec_miibus_writereg(device_t dev, int phy, int reg, int value); +int tsec_miibus_writereg(device_t dev, int phy, int reg, int value); void tsec_miibus_statchg(device_t dev); int tsec_resume(device_t dev); /* XXX */ -void tsec_shutdown(device_t dev); +int tsec_shutdown(device_t dev); int tsec_suspend(device_t dev); /* XXX */ void tsec_get_hwaddr(struct tsec_softc *sc, uint8_t *addr); diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 5eaa2efc9903..5a9dc1cf0e92 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -275,8 +275,8 @@ void pmap_bootstrap_ap(volatile uint32_t *); static void mmu_booke_change_wiring(mmu_t, pmap_t, vm_offset_t, boolean_t); static void mmu_booke_clear_modify(mmu_t, vm_page_t); static void mmu_booke_clear_reference(mmu_t, vm_page_t); -static void mmu_booke_copy(pmap_t, pmap_t, vm_offset_t, vm_size_t, - vm_offset_t); +static void mmu_booke_copy(mmu_t, pmap_t, pmap_t, vm_offset_t, + vm_size_t, vm_offset_t); static void mmu_booke_copy_page(mmu_t, vm_page_t, vm_page_t); static void mmu_booke_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); @@ -1890,8 +1890,8 @@ mmu_booke_deactivate(mmu_t mmu, struct thread *td) * This routine is only advisory and need not do anything. */ static void -mmu_booke_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, - vm_size_t len, vm_offset_t src_addr) +mmu_booke_copy(mmu_t mmu, pmap_t dst_pmap, pmap_t src_pmap, + vm_offset_t dst_addr, vm_size_t len, vm_offset_t src_addr) { }