From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Apr 2009 23:43:20 +0000 (-0700)
Subject: Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux... 
X-Git-Tag: v2.6.30-rc3~72
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20d9207849d5abe60461841b3c3724f6e7c9d33e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

* 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: UV BAU distribution and payload MMRs
  x86: UV: BAU partition-relative distribution map
  x86, uv: add Kconfig dependency on NUMA for UV systems
  x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems
  x86, UV: Fix for nodes with memory and no cpus
  x86, UV: system table in bios accessed after unmap
  x86: UV BAU messaging timeouts
  x86: UV BAU and nodes with no memory
---

20d9207849d5abe60461841b3c3724f6e7c9d33e
diff --cc arch/x86/kernel/tlb_uv.c
index deb5ebb,7842233..ed0c337
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@@ -306,12 -334,13 +336,12 @@@ const struct cpumask *uv_flush_tlb_othe
  					  struct mm_struct *mm,
  					  unsigned long va, unsigned int cpu)
  {
 -	static DEFINE_PER_CPU(cpumask_t, flush_tlb_mask);
 -	struct cpumask *flush_mask = &__get_cpu_var(flush_tlb_mask);
 +	struct cpumask *flush_mask = __get_cpu_var(uv_flush_tlb_mask);
  	int i;
  	int bit;
- 	int blade;
+ 	int pnode;
  	int uv_cpu;
- 	int this_blade;
+ 	int this_pnode;
  	int locals = 0;
  	struct bau_desc *bau_desc;