Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/acpi Fix build break.



details:   https://anonhg.NetBSD.org/src/rev/d617a5683b32
branches:  trunk
changeset: 813440:d617a5683b32
user:      htodd <htodd%NetBSD.org@localhost>
date:      Thu Jan 28 23:50:04 2016 +0000

description:
Fix build break.

diffstat:

 sys/arch/x86/acpi/acpi_machdep.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 8ce493e88c03 -r d617a5683b32 sys/arch/x86/acpi/acpi_machdep.c
--- a/sys/arch/x86/acpi/acpi_machdep.c  Thu Jan 28 19:40:29 2016 +0000
+++ b/sys/arch/x86/acpi/acpi_machdep.c  Thu Jan 28 23:50:04 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.11 2016/01/28 01:09:56 christos Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.12 2016/01/28 23:50:04 htodd Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.11 2016/01/28 01:09:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.12 2016/01/28 23:50:04 htodd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,6 +89,7 @@
        ACPI_PHYSICAL_ADDRESS PhysicalAddress;
        ACPI_STATUS Status;
 
+#ifndef XEN
        /* If EFI is available, attempt to use it to locate the ACPI table. */
        if (efi_probe()) {
                PhysicalAddress = efi_getcfgtblpa(&EFI_UUID_ACPI20);
@@ -98,6 +99,7 @@
                        return PhysicalAddress;
        }
 
+#endif
        Status = AcpiFindRootPointer(&PhysicalAddress);
        if (ACPI_FAILURE(Status))
                PhysicalAddress = 0;



Home | Main Index | Thread Index | Old Index