From owner-svn-src-projects@FreeBSD.ORG  Sun Sep  8 18:58:34 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 24A60CA9;
 Sun,  8 Sep 2013 18:58:34 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 118D12BAE;
 Sun,  8 Sep 2013 18:58:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r88IwXer085819;
 Sun, 8 Sep 2013 18:58:33 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r88IwXtl085808;
 Sun, 8 Sep 2013 18:58:33 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201309081858.r88IwXtl085808@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 8 Sep 2013 18:58:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r255399 - projects/pseries/powerpc/pseries
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Sep 2013 18:58:34 -0000

Author: nwhitehorn
Date: Sun Sep  8 18:58:33 2013
New Revision: 255399
URL: http://svnweb.freebsd.org/changeset/base/255399

Log:
  Update to work with HEAD.

Modified:
  projects/pseries/powerpc/pseries/mmu_phyp.c
  projects/pseries/powerpc/pseries/platform_chrp.c

Modified: projects/pseries/powerpc/pseries/mmu_phyp.c
==============================================================================
--- projects/pseries/powerpc/pseries/mmu_phyp.c	Sun Sep  8 18:27:26 2013	(r255398)
+++ projects/pseries/powerpc/pseries/mmu_phyp.c	Sun Sep  8 18:58:33 2013	(r255399)
@@ -45,7 +45,6 @@
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_pageout.h>
-#include <vm/vm_pager.h>
 #include <vm/uma.h>
 
 #include <powerpc/aim/mmu_oea64.h>

Modified: projects/pseries/powerpc/pseries/platform_chrp.c
==============================================================================
--- projects/pseries/powerpc/pseries/platform_chrp.c	Sun Sep  8 18:27:26 2013	(r255398)
+++ projects/pseries/powerpc/pseries/platform_chrp.c	Sun Sep  8 18:58:33 2013	(r255399)
@@ -80,7 +80,7 @@ static struct cpu_group *chrp_smp_topo(p
 static void chrp_reset(platform_t);
 #ifdef __powerpc64__
 #include "phyp-hvcall.h"
-static void phyp_cpu_idle(void);
+static void phyp_cpu_idle(sbintime_t sbt);
 #endif
 
 static platform_method_t chrp_methods[] = {
@@ -384,7 +384,7 @@ chrp_reset(platform_t platform)
 
 #ifdef __powerpc64__
 static void
-phyp_cpu_idle(void)
+phyp_cpu_idle(sbintime_t sbt)
 {
 	#ifdef NOTYET /* Causes hangs on QEMU */
 	phyp_hcall(H_CEDE);