From 4987a90323bfe7303c00e8b4ef18b7396e0ee564 Mon Sep 17 00:00:00 2001 From: Jack Steiner Date: Thu, 7 Jan 2010 10:12:40 -0600 Subject: [PATCH] --- yaml --- r: 182602 b: refs/heads/master c: e1e0138d7d10fd447c71cc70f367eac514bd3ce4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/uv/uv_hub.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ac644114461..ecab06495593 100644 --- 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 index 811bfabc80b7..7a81d9db57b9 100644 --- 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); } /*