From owner-svn-src-head@FreeBSD.ORG Sat Jun 13 08:57:05 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4AAE106566C; Sat, 13 Jun 2009 08:57:05 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C23588FC12; Sat, 13 Jun 2009 08:57:05 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5D8v54G007962; Sat, 13 Jun 2009 08:57:05 GMT (envelope-from raj@svn.freebsd.org) Received: (from raj@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5D8v5mM007958; Sat, 13 Jun 2009 08:57:05 GMT (envelope-from raj@svn.freebsd.org) Message-Id: <200906130857.n5D8v5mM007958@svn.freebsd.org> From: Rafal Jaworowski Date: Sat, 13 Jun 2009 08:57:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194101 - in head/sys: dev/sec dev/tsec powerpc/booke X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jun 2009 08:57:06 -0000 Author: raj Date: Sat Jun 13 08:57:04 2009 New Revision: 194101 URL: http://svn.freebsd.org/changeset/base/194101 Log: Fix Book-E/MPC85XX build. Some prototypes were wrong and got revealed with the recent kobj signature checking. Modified: head/sys/dev/sec/sec.c head/sys/dev/tsec/if_tsec.c head/sys/dev/tsec/if_tsec.h head/sys/powerpc/booke/pmap.c Modified: head/sys/dev/sec/sec.c ============================================================================== --- head/sys/dev/sec/sec.c Sat Jun 13 08:04:56 2009 (r194100) +++ head/sys/dev/sec/sec.c Sat Jun 13 08:57:04 2009 (r194101) @@ -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 Modified: head/sys/dev/tsec/if_tsec.c ============================================================================== --- head/sys/dev/tsec/if_tsec.c Sat Jun 13 08:04:56 2009 (r194100) +++ head/sys/dev/tsec/if_tsec.c Sat Jun 13 08:57:04 2009 (r194101) @@ -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 ph 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 p if (timeout == 0) device_printf(dev, "Timeout while writing to PHY!\n"); + + return (0); } void Modified: head/sys/dev/tsec/if_tsec.h ============================================================================== --- head/sys/dev/tsec/if_tsec.h Sat Jun 13 08:04:56 2009 (r194100) +++ head/sys/dev/tsec/if_tsec.h Sat Jun 13 08:57:04 2009 (r194101) @@ -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); Modified: head/sys/powerpc/booke/pmap.c ============================================================================== --- head/sys/powerpc/booke/pmap.c Sat Jun 13 08:04:56 2009 (r194100) +++ head/sys/powerpc/booke/pmap.c Sat Jun 13 08:57:04 2009 (r194101) @@ -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 t * 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) { }