Merge branch 'x86/paravirt' into x86/apic

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c

diff --cc arch/x86/include/asm/paravirt.h
index 7e674ea80f0decd8ea409dab74c0c113dbb443f3,c85e7475e1719a1aa4bf4592b62e82b9d800b76c..ff691736f5e9657db383f7e0a2a13d6d2b36b02b
--- 1/arch/x86/include/asm/paravirt.h
--- 2/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@@ -1371,8 -1466,13 +1466,11 @@@ static inline void __set_fixmap(unsigne
  }
  
  void _paravirt_nop(void);
+ u32 _paravirt_ident_32(u32);
+ u64 _paravirt_ident_64(u64);
+ 
  #define paravirt_nop  ((void *)_paravirt_nop)
  
 -void paravirt_use_bytelocks(void);
 -
  #ifdef CONFIG_SMP
  
  static inline int __raw_spin_is_locked(struct raw_spinlock *lock)

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

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

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

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

diff --cc arch/x86/mach-voyager/voyager_smp.c
index 328cb0ce62f0bc4ded7946f2cd7dec3405fbee00,58c7cac3440d3628c4720d86b51226d641286a9e..6f5a38c7f9001050ce4fdb5f7e0466fcbfe3e0bd
--- 1/arch/x86/mach-voyager/voyager_smp.c
--- 2/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@@ -1744,13 -1746,13 +1744,13 @@@ static void __init voyager_smp_prepare_
  
  static void __cpuinit voyager_smp_prepare_boot_cpu(void)
  {
-       switch_to_new_gdt();
+       int cpu = smp_processor_id();
+       switch_to_new_gdt(cpu);
  
 -      cpu_set(cpu, cpu_online_map);
 -      cpu_set(cpu, cpu_callout_map);
 -      cpu_set(cpu, cpu_possible_map);
 -      cpu_set(cpu, cpu_present_map);
 +      cpu_online_map = cpumask_of_cpu(smp_processor_id());
 +      cpu_callout_map = cpumask_of_cpu(smp_processor_id());
 +      cpu_callin_map = CPU_MASK_NONE;
 +      cpu_present_map = cpumask_of_cpu(smp_processor_id());
- 
  }
  
  static int __cpuinit voyager_cpu_up(unsigned int cpu)