[patch 016/123] x86, uv: uv_global_gru_mmr_address() macro fix
in [Kernel]
|
Prev: [patch 009/123] mac80211: quit addba_resp_timer if Tx BA session is torn down
Next: [patch 001/123] ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI
From: Greg KH on 12 Mar 2010 20:40 2.6.33-stable review patch. If anyone has any objections, please let me know. ----------------- From: Jack Steiner <steiner(a)sgi.com> commit e1e0138d7d10fd447c71cc70f367eac514bd3ce4 upstream. Fix bug in uv_global_gru_mmr_address macro. Macro failed to cast an int value to a long prior to a left shift > 32. Signed-off-by: Jack Steiner <steiner(a)sgi.com> LKML-Reference: <20100107161240.GA2610(a)sgi.com> Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- arch/x86/include/asm/uv/uv_hub.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h @@ -329,7 +329,8 @@ static inline unsigned long uv_read_glob */ 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); } static inline void uv_write_global_mmr8(int pnode, unsigned long offset, unsigned char val) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |