---

yaml --- r: 182602 b: refs/heads/master c: e1e0138 h: refs/heads/master v: v3
git-mirror · Jan 7, 2010 · 4987a90 · 4987a90
1 parent 372642a
commit 4987a90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b76365a18f7593c9df32a74bf2b4a39741b67bc6
+refs/heads/master: e1e0138d7d10fd447c71cc70f367eac514bd3ce4
diff --git a/trunk/arch/x86/include/asm/uv/uv_hub.h b/trunk/arch/x86/include/asm/uv/uv_hub.h
@@ -335,7 +335,8 @@ static inline unsigned long uv_read_global_mmr64(int pnode,
  */
 static inline unsigned long uv_global_gru_mmr_address(int pnode, unsigned long offset)
 {
-	return UV_GLOBAL_GRU_MMR_BASE | offset | (pnode << uv_hub_info->m_val);
+	return UV_GLOBAL_GRU_MMR_BASE | offset |
+		((unsigned long)pnode << uv_hub_info->m_val);
 }
 
 /*