[src/trunk]: src/sys/arch/x86/x86 Based on PR kern/44069, revert revision 1.79.

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

details:   https://anonhg.NetBSD.org/src/rev/db6e63cbd5e6
branches:  trunk
changeset: 779026:db6e63cbd5e6
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Apr 26 10:15:42 2012 +0000

description:
Based on PR kern/44069, revert revision 1.79.

XXX: The actual problem related to Qemu/KVM is yet to be determined.

diffstat:

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

diffs (27 lines):

diff -r 52a26f41313d -r db6e63cbd5e6 sys/arch/x86/x86/mpacpi.c
--- a/sys/arch/x86/x86/mpacpi.c Thu Apr 26 06:51:05 2012 +0000
+++ b/sys/arch/x86/x86/mpacpi.c Thu Apr 26 10:15:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $       */
+/*     $NetBSD: mpacpi.c,v 1.93 2012/04/26 10:15:42 jruoho Exp $       */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.92 2011/07/01 18:21:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.93 2012/04/26 10:15:42 jruoho Exp $");
 
 #include "acpica.h"
 #include "opt_acpi.h"
@@ -1133,7 +1133,7 @@
                 *   0 = PIC mode, 1 = APIC mode, 2 = SAPIC mode.
                 */
                rv = acpi_eval_set_integer(NULL, "\\_PIC", 1);
-               if (ACPI_FAILURE(rv) && rv != AE_NOT_FOUND) {
+               if (ACPI_FAILURE(rv)) {
                        if (mp_verbose)
                                printf("mpacpi: switch to APIC mode failed\n");
                        return 0;