Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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()

diff --cc arch/x86/include/asm/uv/bios.h
Simple merge

diff --cc arch/x86/include/asm/uv/uv_hub.h
index 40be813fefb13063d1a813cec22047acc7b4e02e,7a81d9db57b9fec76f2bc04fc1e925eac6bbb537..14cc74ba5d23471c1656812ef61765d4403bb4ed
--- 1/arch/x86/include/asm/uv/uv_hub.h
--- 2/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.

diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge

diff --cc arch/x86/kernel/bios_uv.c
Simple merge