Date: Fri, 20 Feb 2015 19:42:27 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r279079 - head/sys/x86/acpica Message-ID: <201502201942.t1KJgR9R048158@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502201942.t1KJgR9R048158>