Author: andrew
Date: Tue Nov 22 18:13:04 2016
New Revision: 309016
URL: https://svnweb.freebsd.org/changeset/base/309016

Log:
  Only build acpi_timer.c on x86, it fails on arm64 as it attempts to access
  an invalid address. It is also unneeded on arm64 as we use the ARM Generic
  Timer driver.
  
  Obtained from:        ABT Systems Ltd
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/conf/files
  head/sys/conf/files.amd64
  head/sys/conf/files.i386

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Tue Nov 22 17:42:59 2016        (r309015)
+++ head/sys/conf/files Tue Nov 22 18:13:04 2016        (r309016)
@@ -667,7 +667,6 @@ dev/acpica/acpi_resource.c  optional acpi
 dev/acpica/acpi_smbat.c                optional acpi
 dev/acpica/acpi_thermal.c      optional acpi
 dev/acpica/acpi_throttle.c     optional acpi
-dev/acpica/acpi_timer.c                optional acpi
 dev/acpica/acpi_video.c                optional acpi_video acpi
 dev/acpica/acpi_dock.c         optional acpi_dock acpi
 dev/adlink/adlink.c            optional adlink

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64   Tue Nov 22 17:42:59 2016        (r309015)
+++ head/sys/conf/files.amd64   Tue Nov 22 18:13:04 2016        (r309016)
@@ -187,6 +187,7 @@ crypto/via/padlock_cipher.c optional        pad
 crypto/via/padlock_hash.c      optional        padlock
 dev/acpica/acpi_if.m           standard
 dev/acpica/acpi_hpet.c         optional acpi
+dev/acpica/acpi_timer.c                optional        acpi
 dev/acpi_support/acpi_wmi_if.m standard
 dev/agp/agp_amd64.c            optional        agp
 dev/agp/agp_i810.c             optional        agp

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386    Tue Nov 22 17:42:59 2016        (r309015)
+++ head/sys/conf/files.i386    Tue Nov 22 18:13:04 2016        (r309016)
@@ -332,6 +332,7 @@ dev/viawd/viawd.c           optional viawd
 dev/vmware/vmxnet3/if_vmx.c    optional vmx
 dev/acpica/acpi_if.m           standard
 dev/acpica/acpi_hpet.c         optional acpi
+dev/acpica/acpi_timer.c                optional acpi
 dev/acpi_support/acpi_wmi_if.m standard
 dev/wbwd/wbwd.c                        optional wbwd
 dev/wpi/if_wpi.c               optional wpi
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to