From b974cc814dab690af131f148a00d05fc95460f79 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Mon, 3 Mar 2008 14:12:32 -0300
Subject: [PATCH] --- yaml --- r: 88700 b: refs/heads/master c:
 16694024d6d6fa84dfcf5400b53afe1e75cebf0d h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/include/asm-x86/smp.h    | 14 ++++++++++++++
 trunk/include/asm-x86/smp_32.h | 14 --------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index a8a185726c08..d7595843b8f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53ebef4961c7d5347b4fa2b878258ccd11fc9663
+refs/heads/master: 16694024d6d6fa84dfcf5400b53afe1e75cebf0d
diff --git a/trunk/include/asm-x86/smp.h b/trunk/include/asm-x86/smp.h
index c130a87c956d..d11b92b56353 100644
--- a/trunk/include/asm-x86/smp.h
+++ b/trunk/include/asm-x86/smp.h
@@ -8,6 +8,20 @@ extern cpumask_t cpu_callout_map;
 extern int smp_num_siblings;
 extern unsigned int num_processors;
 
+struct smp_ops {
+	void (*smp_prepare_boot_cpu)(void);
+	void (*smp_prepare_cpus)(unsigned max_cpus);
+	int (*cpu_up)(unsigned cpu);
+	void (*smp_cpus_done)(unsigned max_cpus);
+
+	void (*smp_send_stop)(void);
+	void (*smp_send_reschedule)(int cpu);
+	int (*smp_call_function_mask)(cpumask_t mask,
+				      void (*func)(void *info), void *info,
+				      int wait);
+};
+
+
 #ifdef CONFIG_X86_32
 # include "smp_32.h"
 #else
diff --git a/trunk/include/asm-x86/smp_32.h b/trunk/include/asm-x86/smp_32.h
index 9a4057d94367..72faad6509c7 100644
--- a/trunk/include/asm-x86/smp_32.h
+++ b/trunk/include/asm-x86/smp_32.h
@@ -38,20 +38,6 @@ extern void remove_siblinginfo(int cpu);
 /* Globals due to paravirt */
 extern void set_cpu_sibling_map(int cpu);
 
-struct smp_ops
-{
-	void (*smp_prepare_boot_cpu)(void);
-	void (*smp_prepare_cpus)(unsigned max_cpus);
-	int (*cpu_up)(unsigned cpu);
-	void (*smp_cpus_done)(unsigned max_cpus);
-
-	void (*smp_send_stop)(void);
-	void (*smp_send_reschedule)(int cpu);
-	int (*smp_call_function_mask)(cpumask_t mask,
-				      void (*func)(void *info), void *info,
-				      int wait);
-};
-
 #ifdef CONFIG_SMP
 extern struct smp_ops smp_ops;