svn commit: r262620 - in stable: 10/sys/sparc64/sparc64 9/sys/sparc64/sparc64

[Dimitry Andric]

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/9/sys/sparc64/sparc64/spitfire.c
Directory Properties:
  stable/9/sys/   (props changed)

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

Modified: stable/9/sys/sparc64/sparc64/spitfire.c
==============================================================================
--- stable/9/sys/sparc64/sparc64/spitfire.c	Fri Feb 28 19:51:47 2014	(r262619)
+++ stable/9/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);