From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Feb 2010 19:00:55 +0000 (-0800)
Subject: Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~9833^2~3070
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=30ff056c42c665b9ea535d8515890857ae382540;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-uv-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, uv: Remove recursion in uv_heartbeat_enable()
  x86, uv: uv_global_gru_mmr_address() macro fix
  x86, uv: Add serial number parameter to uv_bios_get_sn_info()
---

30ff056c42c665b9ea535d8515890857ae382540
diff --cc arch/x86/include/asm/uv/uv_hub.h
index 40be813fefb1,7a81d9db57b9..14cc74ba5d23
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@@ -329,19 -335,10 +329,20 @@@ static inline unsigned long uv_read_glo
   */
  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)
 +{
 +	writeb(val, uv_global_mmr64_address(pnode, offset));
 +}
 +
 +static inline unsigned char uv_read_global_mmr8(int pnode, unsigned long offset)
 +{
 +	return readb(uv_global_mmr64_address(pnode, offset));
 +}
 +
  /*
   * Access hub local MMRs. Faster than using global space but only local MMRs
   * are accessible.