Module Name: src Committed By: jruoho Date: Thu Apr 26 10:15:42 UTC 2012
Modified Files: src/sys/arch/x86/x86: mpacpi.c Log Message: Based on PR kern/44069, revert revision 1.79. XXX: The actual problem related to Qemu/KVM is yet to be determined. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/arch/x86/x86/mpacpi.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/x86/x86/mpacpi.c diff -u src/sys/arch/x86/x86/mpacpi.c:1.92 src/sys/arch/x86/x86/mpacpi.c:1.93 --- src/sys/arch/x86/x86/mpacpi.c:1.92 Fri Jul 1 18:21:31 2011 +++ src/sys/arch/x86/x86/mpacpi.c Thu Apr 26 10:15:42 2012 @@ -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 @@ mpacpi_find_interrupts(void *self) * 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;