From owner-svn-src-head@freebsd.org  Sat Feb 24 18:12:38 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBDBBF32F64;
 Sat, 24 Feb 2018 18:12:38 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7ABA66FB39;
 Sat, 24 Feb 2018 18:12:38 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75B6E29173;
 Sat, 24 Feb 2018 18:12:38 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1OICcHo013678;
 Sat, 24 Feb 2018 18:12:38 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1OICcc4013677;
 Sat, 24 Feb 2018 18:12:38 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201802241812.w1OICcc4013677@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sat, 24 Feb 2018 18:12:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r329918 - head/sys/powerpc/powerpc
X-SVN-Group: head
X-SVN-Commit-Author: jhibbits
X-SVN-Commit-Paths: head/sys/powerpc/powerpc
X-SVN-Commit-Revision: 329918
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Feb 2018 18:12:39 -0000

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)
 {