From owner-svn-src-head@freebsd.org  Tue Mar 13 18:24:22 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 51A9CF3F3D0;
 Tue, 13 Mar 2018 18:24:22 +0000 (UTC)
 (envelope-from nwhitehorn@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 F38226D621;
 Tue, 13 Mar 2018 18:24:21 +0000 (UTC)
 (envelope-from nwhitehorn@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 E70941D5C9;
 Tue, 13 Mar 2018 18:24:21 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2DIOLSR066233;
 Tue, 13 Mar 2018 18:24:21 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DIOLTb066232;
 Tue, 13 Mar 2018 18:24:21 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201803131824.w2DIOLTb066232@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to
 nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 13 Mar 2018 18:24:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r330870 - head/sys/powerpc/aim
X-SVN-Group: head
X-SVN-Commit-Author: nwhitehorn
X-SVN-Commit-Paths: head/sys/powerpc/aim
X-SVN-Commit-Revision: 330870
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: Tue, 13 Mar 2018 18:24:22 -0000

Author: nwhitehorn
Date: Tue Mar 13 18:24:21 2018
New Revision: 330870
URL: https://svnweb.freebsd.org/changeset/base/330870

Log:
  Restore missing temporary variable, deleted by accident in r330845. This
  unbreaks the ppc32 AIM build.
  
  Reported by:	jhibbits

Modified:
  head/sys/powerpc/aim/aim_machdep.c

Modified: head/sys/powerpc/aim/aim_machdep.c
==============================================================================
--- head/sys/powerpc/aim/aim_machdep.c	Tue Mar 13 17:57:53 2018	(r330869)
+++ head/sys/powerpc/aim/aim_machdep.c	Tue Mar 13 18:24:21 2018	(r330870)
@@ -228,9 +228,10 @@ aim_cpu_init(vm_offset_t toc)
 	register_t	msr;
 	uint8_t		*cache_check;
 	int		cacheline_warn;
-	#ifndef __powerpc64__
+#ifndef __powerpc64__
+	register_t	scratch;
 	int		ppc64;
-	#endif
+#endif
 
 	trap_offset = 0;
 	cacheline_warn = 0;