From owner-svn-src-all@FreeBSD.ORG  Fri Feb 28 20:22:49 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 ESMTPS id ABB05257;
 Fri, 28 Feb 2014 20:22:49 +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 9734D1435;
 Fri, 28 Feb 2014 20:22:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1SKMnTa067758;
 Fri, 28 Feb 2014 20:22:49 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1SKMnsa067757;
 Fri, 28 Feb 2014 20:22:49 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201402282022.s1SKMnsa067757@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 28 Feb 2014 20:22:49 +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: r262620 - in stable: 10/sys/sparc64/sparc64
 9/sys/sparc64/sparc64
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Feb 2014 20:22:49 -0000

Author: dim
Date: Fri Feb 28 20:22:48 2014
New Revision: 262620
URL: http://svnweb.freebsd.org/changeset/base/262620

Log:
  MFC r262471:
  
  In sys/sparc64/sparc64/spitfire.c, prevent signed shift overflow by
  casting to the appropriate type.  (Note this fix cannot be done in
  sys/sparc64/sparc64/spitfire.c, since that file is also included by
  assembly source files.)
  
  Reviewed by:	marius

Modified:
  stable/10/sys/sparc64/sparc64/spitfire.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/sys/sparc64/sparc64/spitfire.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/10/sys/sparc64/sparc64/spitfire.c
==============================================================================
--- stable/10/sys/sparc64/sparc64/spitfire.c	Fri Feb 28 19:51:47 2014	(r262619)
+++ stable/10/sys/sparc64/sparc64/spitfire.c	Fri Feb 28 20:22:48 2014	(r262620)
@@ -130,7 +130,7 @@ spitfire_icache_page_inval(vm_paddr_t pa
 		    : "=r" (tag) : "r" (addr), "n" (ASI_ICACHE_TAG));
 		if (((tag >> IC_VALID_SHIFT) & IC_VALID_MASK) == 0)
 			continue;
-		tag &= IC_TAG_MASK << IC_TAG_SHIFT;
+		tag &= (u_long)IC_TAG_MASK << IC_TAG_SHIFT;
 		if (tag == target) {
 			PMAP_STATS_INC(spitfire_icache_npage_inval_match);
 			stxa_sync(addr, ASI_ICACHE_TAG, tag);