Merge branch 'x86/uv' into x86/x2apic

Conflicts:

	arch/x86/kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/kernel/Makefile
index 673f1d12b420bfc85a52e42258d44365d6c45fa9,b78a17b128101c68e97cb345a97403a91c7ac185..ea000467553f21fcdd54334473cbdcf7668ffac2
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -102,8 -102,7 +102,9 @@@ obj-$(CONFIG_OLPC)         += olpc.
  # 64 bit specific files
  ifeq ($(CONFIG_X86_64),y)
          obj-y                         += genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o
+       obj-y                           += bios_uv.o
 +        obj-y                         += genx2apic_cluster.o
 +        obj-y                         += genx2apic_phys.o
          obj-$(CONFIG_X86_PM_TIMER)    += pmtimer_64.o
          obj-$(CONFIG_AUDIT)           += audit_64.o
  

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