From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 14 Feb 2011 12:28:29 +0000 (+0100)
Subject: Merge commit 'v2.6.38-rc4' into x86/numa
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b366801c95bdbeda811ac9668a3943051a18c188;p=deliverable%2Flinux.git

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

b366801c95bdbeda811ac9668a3943051a18c188
diff --cc arch/x86/include/asm/smp.h
index 75927822c5c8,1f4695136776..b296ca6f40bb
--- a/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);