Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/tlb_uv.c
index deb5ebb32c3b71a8a698df7b68ae5447e12f0cf8,78422336ddea55fd3719d9f9e11d6d174cd48278..ed0c33761e6d1d75bf0b435c490384e2cd8b31dd
--- 1/arch/x86/kernel/tlb_uv.c
--- 2/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;