Merge commit 'v2.6.38-rc4' into x86/numa

Merge reason: Merge latest fixes before applying new patch.

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

diff --cc arch/x86/include/asm/smp.h
index 75927822c5c8f7ea1290f9f6735c6f81e01e2c7b,1f46951367763471fce5819fcf54045ced1fe8e9..b296ca6f40bb213117389f485cbd17f18fd9e038
--- 1/arch/x86/include/asm/smp.h
--- 2/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@@ -38,15 -38,9 +38,12 @@@ static inline struct cpumask *cpu_core_
  
  DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
  DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
 +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
 +DECLARE_EARLY_PER_CPU(int, x86_cpu_to_logical_apicid);
 +#endif
  
  /* Static state in head.S used to set up a CPU */
- extern struct {
-       void *sp;
-       unsigned short ss;
- } stack_start;
+ extern unsigned long stack_start; /* Initial stack pointer address */
  
  struct smp_ops {
        void (*smp_prepare_boot_cpu)(void);

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