Module Name: src
Committed By: skrll
Date: Fri Aug 26 13:52:38 UTC 2016
Modified Files:
src/sys/arch/evbmips/gdium: mainbus.c
Log Message:
Fix compile for PCI_NETBSD_CONFIGURE
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/gdium/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/gdium/mainbus.c
diff -u src/sys/arch/evbmips/gdium/mainbus.c:1.4 src/sys/arch/evbmips/gdium/mainbus.c:1.5
--- src/sys/arch/evbmips/gdium/mainbus.c:1.4 Fri Jan 27 18:52:54 2012
+++ src/sys/arch/evbmips/gdium/mainbus.c Fri Aug 26 13:52:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2012/01/27 18:52:54 para Exp $ */
+/* $NetBSD: mainbus.c,v 1.5 2016/08/26 13:52:38 skrll Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2012/01/27 18:52:54 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2016/08/26 13:52:38 skrll Exp $");
#include "opt_pci.h"
@@ -99,19 +99,16 @@ mainbus_attach(device_t parent, device_t
aprint_normal("\n");
#if defined(PCI_NETBSD_CONFIGURE)
- {
- struct extent *ioext, *memext;
+ struct mips_cache_info * const mci = &mips_cache_info;
- ioext = extent_create("pciio", 0x00001000, 0x00003fff,
- NULL, 0, EX_NOWAIT);
- memext = extent_create("pcimem", 0, BONITO_PCILO_SIZE,
- NULL, 0, EX_NOWAIT);
-
- pci_configure_bus(&gdium_configuration.gc_pc, ioext, memext,
- NULL, 0, mips_dcache_align);
- extent_destroy(ioext);
- extent_destroy(memext);
- }
+ struct extent *ioext = extent_create("pciio", 0x00001000, 0x00003fff,
+ NULL, 0, EX_NOWAIT);
+ struct extent *memext = extent_create("pcimem", 0, BONITO_PCILO_SIZE,
+ NULL, 0, EX_NOWAIT);
+ pci_configure_bus(&gdium_configuration.gc_pc, ioext, memext,
+ NULL, 0, mci->mci_dcache_align);
+ extent_destroy(ioext);
+ extent_destroy(memext);
#endif /* PCI_NETBSD_CONFIGURE */
for (i = 0; i < __arraycount(mainbusdevs); i++) {
