From owner-svn-src-all@FreeBSD.ORG  Fri Feb 20 19:42:27 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 570B3340;
 Fri, 20 Feb 2015 19:42:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 42BF2DB5;
 Fri, 20 Feb 2015 19:42:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1KJgR28048159;
 Fri, 20 Feb 2015 19:42:27 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1KJgR9R048158;
 Fri, 20 Feb 2015 19:42:27 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201502201942.t1KJgR9R048158@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Fri, 20 Feb 2015 19:42:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279079 - head/sys/x86/acpica
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2015 19:42:27 -0000

Author: tijl
Date: Fri Feb 20 19:42:26 2015
New Revision: 279079
URL: https://svnweb.freebsd.org/changeset/base/279079

Log:
  Fix build on i386 without "device apic"
  
  Reviewed by:	kib

Modified:
  head/sys/x86/acpica/acpi_wakeup.c

Modified: head/sys/x86/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/x86/acpica/acpi_wakeup.c	Fri Feb 20 19:42:05 2015	(r279078)
+++ head/sys/x86/acpica/acpi_wakeup.c	Fri Feb 20 19:42:26 2015	(r279079)
@@ -30,6 +30,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#if defined(__amd64__)
+#define DEV_APIC
+#else
+#include "opt_apic.h"
+#endif
 #ifdef __i386__
 #include "opt_npx.h"
 #endif
@@ -55,8 +60,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/specialreg.h>
 #include <machine/md_var.h>
 
+#ifdef DEV_APIC
 #include <x86/apicreg.h>
 #include <x86/apicvar.h>
+#endif
 #ifdef SMP
 #include <machine/smp.h>
 #include <machine/vmparam.h>
@@ -271,7 +278,9 @@ acpi_wakeup_machdep(struct acpi_softc *s
 			initializecpu();
 			PCPU_SET(switchtime, 0);
 			PCPU_SET(switchticks, ticks);
+#ifdef DEV_APIC
 			lapic_xapic_mode();
+#endif
 #ifdef SMP
 			if (!CPU_EMPTY(&suspcpus))
 				acpi_wakeup_cpus(sc);