Author: jhibbits
Date: Sat Feb 24 18:12:38 2018
New Revision: 329918
URL: https://svnweb.freebsd.org/changeset/base/329918
Log:
Unbreak 64-bit Book-E builds post r329712
can_wakeup is defined only in AIM's locore64.S, so conditionalize use of it
on AIM in addition to powerpc64.
Modified:
head/sys/powerpc/powerpc/cpu.c
Modified: head/sys/powerpc/powerpc/cpu.c
==============================================================================
--- head/sys/powerpc/powerpc/cpu.c Sat Feb 24 17:54:12 2018
(r329917)
+++ head/sys/powerpc/powerpc/cpu.c Sat Feb 24 18:12:38 2018
(r329918)
@@ -89,7 +89,7 @@ int powerpc_pow_enabled;
void (*cpu_idle_hook)(sbintime_t) = NULL;
static void cpu_idle_60x(sbintime_t);
static void cpu_idle_booke(sbintime_t);
-#ifdef __powerpc64__
+#if defined(__powerpc64__) && defined(AIM)
static void cpu_idle_powerx(sbintime_t);
#endif
@@ -620,7 +620,7 @@ static void
cpu_powerx_setup(int cpuid, uint16_t vers)
{
-#ifdef __powerpc64__
+#if defined(__powerpc64__) && defined(AIM)
if ((mfmsr() & PSL_HV) == 0)
return;
@@ -745,7 +745,7 @@ cpu_idle_booke(sbintime_t sbt)
#endif
}
-#ifdef __powerpc64__
+#if defined(__powerpc64__) && defined(AIM)
static void
cpu_idle_powerx(sbintime_t sbt)
{
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
