Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1e0138d authored by Jack Steiner's avatar Jack Steiner Committed by H. Peter Anvin
Browse files

x86, uv: uv_global_gru_mmr_address() macro fix 



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: default avatarJack Steiner <steiner@sgi.com>
LKML-Reference: <20100107161240.GA2610@sgi.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent b76365a1

arch/x86/include/asm/uv/uv_hub.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -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)

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);

}

}





/*

/*