From: Chris Wright <chrisw@osdl.org>
Date: Thu, 11 Aug 2005 23:53:42 +0000 (-0700)
Subject: Merge with Greg.
X-Git-Tag: v2.6.12.6~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50bf494ec22b884702ee0e745666fee16510f8f9;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge with Greg.
---

50bf494ec22b884702ee0e745666fee16510f8f9
diff --cc review/x86_64-fix-smpboot-timing-problem.patch
index bd2382886e0,20610af8eb6..47beff4badb
--- a/review/x86_64-fix-smpboot-timing-problem.patch
+++ b/review/x86_64-fix-smpboot-timing-problem.patch
@@@ -27,17 -27,12 +27,18 @@@ it fixes it for the right reasons
  
  Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
  Signed-off-by: Andi Kleen <ak@suse.de>
 +Signed-off-by: Chris Wright <chrisw@osdl.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +---
 + arch/x86_64/kernel/smp.c     |   65 +++++++++++++++++++++++++++++++++++++++++++
 + arch/x86_64/kernel/smpboot.c |   21 +++++++------
 + include/asm-x86_64/smp.h     |    2 +
 + 3 files changed, 79 insertions(+), 9 deletions(-)
  
 -Index: linux-2.6.12/arch/x86_64/kernel/smp.c
 +Index: linux-2.6.12.y/arch/x86_64/kernel/smp.c
  ===================================================================
 ---- linux-2.6.12.orig/arch/x86_64/kernel/smp.c
 -+++ linux-2.6.12/arch/x86_64/kernel/smp.c
 +--- linux-2.6.12.y.orig/arch/x86_64/kernel/smp.c
 ++++ linux-2.6.12.y/arch/x86_64/kernel/smp.c
  @@ -284,6 +284,71 @@ struct call_data_struct {
   static struct call_data_struct * call_data;