[src/netbsd-7]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bc773d33c775
branches:  netbsd-7
changeset: 799565:bc773d33c775
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Aug 11 05:15:25 2015 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #947):
        sys/arch/x86/x86/mpacpi.c: revision 1.98
Fix wrong output in mpacpi_pci_foundbus() with MPVERBOSE. Assign
vaues before printing them.

diffstat:

 sys/arch/x86/x86/mpacpi.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r b8c57e80fb60 -r bc773d33c775 sys/arch/x86/x86/mpacpi.c
--- a/sys/arch/x86/x86/mpacpi.c Tue Aug 11 05:13:44 2015 +0000
+++ b/sys/arch/x86/x86/mpacpi.c Tue Aug 11 05:15:25 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpacpi.c,v 1.97.10.1 2015/08/11 05:07:16 snj Exp $     */
+/*     $NetBSD: mpacpi.c,v 1.97.10.2 2015/08/11 05:15:25 snj Exp $     */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.97.10.1 2015/08/11 05:07:16 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.97.10.2 2015/08/11 05:15:25 snj Exp $");
 
 #include "acpica.h"
 #include "opt_acpi.h"
@@ -500,6 +500,12 @@
        }
 
        mpr = kmem_zalloc(sizeof(struct mpacpi_pcibus), KM_SLEEP);
+       mpr->mpr_handle = ad->ad_handle;
+       mpr->mpr_buf = buf;
+       mpr->mpr_seg = ad->ad_pciinfo->ap_segment;
+       mpr->mpr_bus = ad->ad_pciinfo->ap_downbus;
+       TAILQ_INSERT_TAIL(&mpacpi_pcibusses, mpr, mpr_list);
+
        if ((ad->ad_devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) != 0) {
                if (mp_verbose)
                        printf("mpacpi: found root PCI bus %d\n",
@@ -511,12 +517,6 @@
                            mpr->mpr_bus);
        }
 
-       mpr->mpr_handle = ad->ad_handle;
-       mpr->mpr_buf = buf;
-       mpr->mpr_seg = ad->ad_pciinfo->ap_segment;
-       mpr->mpr_bus = ad->ad_pciinfo->ap_downbus;
-       TAILQ_INSERT_TAIL(&mpacpi_pcibusses, mpr, mpr_list);
-
        /*
         * XXX this wrongly assumes that bus numbers are unique
         * even between segments.