From owner-svn-src-stable-10@FreeBSD.ORG  Sun Feb 16 22:01:44 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B33C456B;
 Sun, 16 Feb 2014 22:01:44 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9D6881352;
 Sun, 16 Feb 2014 22:01:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1GM1ikN070454;
 Sun, 16 Feb 2014 22:01:44 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1GM1iDC070453;
 Sun, 16 Feb 2014 22:01:44 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201402162201.s1GM1iDC070453@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 16 Feb 2014 22:01:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262001 - stable/10/sys/ia64/ia64
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Feb 2014 22:01:44 -0000

Author: marcel
Date: Sun Feb 16 22:01:44 2014
New Revision: 262001
URL: http://svnweb.freebsd.org/changeset/base/262001

Log:
  MFC r260666:
  In the nested TLB fault handler, for a direct-mapped address, make
  sure to clear the lower 12 bits.

Modified:
  stable/10/sys/ia64/ia64/exception.S
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ia64/ia64/exception.S
==============================================================================
--- stable/10/sys/ia64/ia64/exception.S	Sun Feb 16 21:53:33 2014	(r262000)
+++ stable/10/sys/ia64/ia64/exception.S	Sun Feb 16 22:01:44 2014	(r262001)
@@ -1026,7 +1026,7 @@ IVT_ENTRY(Data_Nested_TLB, 0x1400)
 }
 {	.mii
 	mov		cr.itir=r26
-(p12)	dep		r28=0,r30,61,3
+(p12)	dep		r28=0,r30,0,12
 (p13)	extr.u		r28=r30,3*PAGE_SHIFT-8, PAGE_SHIFT-3	// dir L0 index
 	;;
 }