[PATCH 04/52] define smp_ops in common header

From: Glauber Costa
Date: Mon Mar 03 2008 - 12:15:01 EST


x86_64 will benefit from it
Signed-off-by: Glauber Costa <gcosta@xxxxxxxxxx>
---
include/asm-x86/smp.h | 14 ++++++++++++++
include/asm-x86/smp_32.h | 14 --------------
2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index c130a87..d11b92b 100644
--- a/include/asm-x86/smp.h
+++ b/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/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 9a4057d..72faad6 100644
--- a/include/asm-x86/smp_32.h
+++ b/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;

--
1.5.0.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/