Date: Fri, 12 Jun 2009 22:49:35 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r194082 - in head/sys/mips: malta mips Message-ID: <200906122249.n5CMnZBm095301@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Fri Jun 12 22:49:35 2009 New Revision: 194082 URL: http://svn.freebsd.org/changeset/base/194082 Log: Fix MALTA build; some prototypes were wrong and blew up when kobj method signature checking was turned on. Modified: head/sys/mips/malta/gt_pci.c head/sys/mips/mips/mainbus.c Modified: head/sys/mips/malta/gt_pci.c ============================================================================== --- head/sys/mips/malta/gt_pci.c Fri Jun 12 22:48:10 2009 (r194081) +++ head/sys/mips/malta/gt_pci.c Fri Jun 12 22:49:35 2009 (r194082) @@ -370,7 +370,7 @@ gt_pci_conf_setup(struct gt_pci_softc *s } static uint32_t -gt_pci_read_config(device_t dev, int bus, int slot, int func, int reg, +gt_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) { struct gt_pci_softc *sc = device_get_softc(dev); @@ -440,7 +440,7 @@ gt_pci_read_config(device_t dev, int bus } static void -gt_pci_write_config(device_t dev, int bus, int slot, int func, int reg, +gt_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, uint32_t data, int bytes) { struct gt_pci_softc *sc = device_get_softc(dev); Modified: head/sys/mips/mips/mainbus.c ============================================================================== --- head/sys/mips/mips/mainbus.c Fri Jun 12 22:48:10 2009 (r194081) +++ head/sys/mips/mips/mainbus.c Fri Jun 12 22:49:35 2009 (r194082) @@ -76,7 +76,7 @@ static int mainbus_deactivate_resource(d static int mainbus_release_resource(device_t, device_t, int, int, struct resource *); static int mainbus_setup_intr(device_t, device_t, struct resource *, - int flags, int (*)(void *), void *, void **); + int flags, driver_filter_t, void (*)(void *), void *, void **); static int mainbus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -319,7 +319,8 @@ mainbus_release_resource(device_t bus, d */ static int mainbus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, int (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), void *arg, + void **cookiep) { panic("can never mainbus_setup_intr"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906122249.n5CMnZBm095301>