From owner-svn-src-head@FreeBSD.ORG  Mon Feb  9 07:08:54 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D96A11DC;
 Mon,  9 Feb 2015 07:08:54 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C561A13C;
 Mon,  9 Feb 2015 07:08:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1978s8X063074;
 Mon, 9 Feb 2015 07:08:54 GMT (envelope-from nwhitehorn@FreeBSD.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1978swm063073;
 Mon, 9 Feb 2015 07:08:54 GMT (envelope-from nwhitehorn@FreeBSD.org)
Message-Id: <201502090708.t1978swm063073@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to
 nwhitehorn@FreeBSD.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 9 Feb 2015 07:08:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278434 - head/sys/powerpc/pseries
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 07:08:55 -0000

Author: nwhitehorn
Date: Mon Feb  9 07:08:54 2015
New Revision: 278434
URL: https://svnweb.freebsd.org/changeset/base/278434

Log:
  Fix typo in PTE insertion overflow handling: use the page we're actually
  returning, not the one we just looked at.

Modified:
  head/sys/powerpc/pseries/mmu_phyp.c

Modified: head/sys/powerpc/pseries/mmu_phyp.c
==============================================================================
--- head/sys/powerpc/pseries/mmu_phyp.c	Mon Feb  9 06:20:34 2015	(r278433)
+++ head/sys/powerpc/pseries/mmu_phyp.c	Mon Feb  9 07:08:54 2015	(r278434)
@@ -299,7 +299,10 @@ mphyp_pte_spillable_ident(u_int ptegidx,
 		}
 	}
 
-	phyp_pft_hcall(H_READ, 0, slot, 0, 0, &to_evict->pte_hi,
+	if (k == -1)
+		return (k);
+
+	phyp_pft_hcall(H_READ, 0, k, 0, 0, &to_evict->pte_hi,
 	    &to_evict->pte_lo, &junk);
 	return (k);
 }