Module Name: src
Committed By: cliff
Date: Wed Jun 15 05:21:38 UTC 2011
Modified Files:
src/sys/arch/evbppc/walnut/dev: pbus.c
Log Message:
in pbus_attach() make locs[] and pass to config_found_sm_loc()
to avoid triggering KASSERT in config_stdsubmatch().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/walnut/dev/pbus.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/evbppc/walnut/dev/pbus.c
diff -u src/sys/arch/evbppc/walnut/dev/pbus.c:1.11 src/sys/arch/evbppc/walnut/dev/pbus.c:1.12
--- src/sys/arch/evbppc/walnut/dev/pbus.c:1.11 Mon Jun 6 16:42:18 2011
+++ src/sys/arch/evbppc/walnut/dev/pbus.c Wed Jun 15 05:21:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $ */
+/* $NetBSD: pbus.c,v 1.12 2011/06/15 05:21:38 cliff Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.12 2011/06/15 05:21:38 cliff Exp $");
#include "locators.h"
#include "pckbc.h"
@@ -152,7 +152,12 @@
pba.pb_bt = &pbus_tag;
pba.pb_dmat = paa->plb_dmat;
- (void) config_found_sm_loc(self, "pbus", NULL, &pba, pbus_print,
+ const int locs[PBUSCF_NLOCS] = {
+ [PBUSCF_ADDR] = pba.pb_addr,
+ [PBUSCF_IRQ] = pba.pb_irq
+ };
+
+ (void) config_found_sm_loc(self, "pbus", locs, &pba, pbus_print,
config_stdsubmatch);
}
