From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Feb 2009 11:16:59 +0000 (+0100)
Subject: Merge branch 'x86/paravirt' into x86/apic
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eca217b36e5d7d4377493d5cedd89105e66a5a72;p=linux-beck.git

Merge branch 'x86/paravirt' into x86/apic

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

eca217b36e5d7d4377493d5cedd89105e66a5a72
diff --cc arch/x86/include/asm/paravirt.h
index 7e674ea80f0d,c85e7475e171..ff691736f5e9
--- a/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/mach-voyager/voyager_smp.c
index 328cb0ce62f0,58c7cac3440d..6f5a38c7f900
--- a/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)