From c9c95208a965db1e8e51f4150e8749f6e69bba8c Mon Sep 17 00:00:00 2001
From: fvdl <fvdl@NetBSD.org>
Date: Thu, 15 May 2003 16:32:50 +0000
Subject: [PATCH] Postpone the ioapic_ih assignment a bit, since the pin number
 may have been corrected in a workaround in the meantime.

---
 sys/arch/x86/x86/mpbios.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys/arch/x86/x86/mpbios.c b/sys/arch/x86/x86/mpbios.c
index 80ca11d87003..870d5fa18d01 100644
--- a/sys/arch/x86/x86/mpbios.c
+++ b/sys/arch/x86/x86/mpbios.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpbios.c,v 1.6 2003/05/15 13:30:31 fvdl Exp $	*/
+/*	$NetBSD: mpbios.c,v 1.7 2003/05/15 16:32:50 fvdl Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -1028,9 +1028,6 @@ mpbios_int(ent, enttype, mpi)
 	mpi->bus_pin = dev;
 	mpi->global_int = -1;
 
-	mpi->ioapic_ih = APIC_INT_VIA_APIC |
-	    ((id<<APIC_INT_APIC_SHIFT) | ((pin<<APIC_INT_PIN_SHIFT)));
-
 	mpi->type = type;
 	mpi->flags = flags;
 	mpi->redir = 0;
@@ -1089,6 +1086,10 @@ mpbios_int(ent, enttype, mpi)
 			mpi->cpu_id = id;
 		}
 	}
+
+	mpi->ioapic_ih = APIC_INT_VIA_APIC |
+	    ((id<<APIC_INT_APIC_SHIFT) | ((pin<<APIC_INT_PIN_SHIFT)));
+
 	if (mp_verbose) {
 		char buf[256];