 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpacpi.c,v 1.74 2009/01/12 08:36:36 sborrill Exp $	*/
+/*	$NetBSD: mpacpi.c,v 1.75 2009/01/14 19:31:25 cegger Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.74 2009/01/12 08:36:36 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.75 2009/01/14 19:31:25 cegger Exp $");
 #include "acpi.h"
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
 #include "opt_multiprocessor.h"
 #include "pchb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/queue.h>
 @@ -882,32 +882,31 @@ mpacpi_config_irouting(struct acpi_softc
 	nintr = mpacpi_nintsrc + NUM_LEGACY_IRQS - 1;
 #if NPCI > 0
 	TAILQ_FOREACH(mpr, &mpacpi_pcibusses, mpr_list) {
 		nintr += mpacpi_pcircount(mpr);
+	}
 	mp_isa_bus = mpacpi_maxpci + BUS_BUFFER; /* XXX */
 #else
 	mp_isa_bus = 0;
 #endif
 	mp_nbus = mp_isa_bus + 1;
 	mp_nintr = nintr;
-	mp_busses = kmem_zalloc(sizeof(struct mp_bus) * mp_nbus, KM_NOSLEEP);
+	mp_busses = kmem_zalloc(sizeof(struct mp_bus) * mp_nbus, KM_SLEEP);
 	if (mp_busses == NULL)
 		panic("can't allocate mp_busses");
-	mp_intrs = kmem_zalloc(sizeof(struct mp_intr_map) * mp_nintr,
+	mp_intrs = kmem_zalloc(sizeof(struct mp_intr_map) * mp_nintr, KM_SLEEP);
 		KM_NOSLEEP);
 	if (mp_intrs == NULL)
 		panic("can't allocate mp_intrs");
 	mbp = &mp_busses[mp_isa_bus];
 	mbp->mb_name = "isa";
 	mbp->mb_idx = 0;
 	mbp->mb_intr_print = mpacpi_print_isa_intr;
 	mbp->mb_intr_cfg = NULL;
 	mbp->mb_intrs = &mp_intrs[0];
 	mbp->mb_data = 0;
 	pic = intr_findpic(0);
 	if (pic == NULL)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpbios.c,v 1.51 2008/12/23 15:31:20 cegger Exp $	*/
+/*	$NetBSD: mpbios.c,v 1.52 2009/01/14 19:31:25 cegger Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -86,27 +86,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * The Intel MP-stuff is just one way of x86 SMP systems
  * so only Intel MP specific stuff is here.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.51 2008/12/23 15:31:20 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.52 2009/01/14 19:31:25 cegger Exp $");
 #include "acpi.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 @@ -606,29 +606,31 @@ mpbios_scan(device_t self, int *ncpup)
 			if (type == MPS_MCT_IOINT) {
 				iep = (const struct mpbios_int *)position;
 				if (iep->dst_apic_id == MPS_ALL_APICS)
 					intr_cnt +=
 					    mp_conf[MPS_MCT_IOAPIC].count;
 				else
 					intr_cnt++;
 			} else if (type == MPS_MCT_LINT)
 				intr_cnt++;
 			position += mp_conf[type].length;
+		}
 		mp_busses = kmem_zalloc(sizeof(struct mp_bus)*mp_nbus,
-			KM_NOSLEEP);
+		    KM_SLEEP);
 		KASSERT(mp_busses != NULL);
 		mp_intrs = kmem_zalloc(sizeof(struct mp_intr_map)*intr_cnt,
-			KM_NOSLEEP);
+		    KM_SLEEP);
 		KASSERT(mp_intrs != NULL);
 		mp_nintr = intr_cnt;
 		/* re-walk the table, recording info of interest */
 		position = (const uint8_t *) mp_cth + sizeof(*mp_cth);
 		count = mp_cth->entry_count;
 		cur_intr = 0;
 		while ((count--) && (position < end)) {
 			switch (type = *position) {
 			case MPS_MCT_CPU:
 #if NACPI > 0
 				/* ACPI has done this for us */
 				if (mpacpi_ncpu)