lkml.org 
[lkml]   [2008]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 06/52] merge smp_send_reschedule
Date
function definition is moved to common header, x86_64 version is now called
native_smp_send_reschedule

Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
arch/x86/kernel/smp_64.c | 7 +++++--
include/asm-x86/smp.h | 5 +++++
include/asm-x86/smp_32.h | 4 ----
include/asm-x86/smp_64.h | 2 --
4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/smp_64.c b/arch/x86/kernel/smp_64.c
index 80dba12..fd18161 100644
--- a/arch/x86/kernel/smp_64.c
+++ b/arch/x86/kernel/smp_64.c
@@ -290,8 +290,9 @@ void flush_tlb_all(void)
* anything. Worst case is that we lose a reschedule ...
*/

-void smp_send_reschedule(int cpu)
+static void native_smp_send_reschedule(int cpu)
{
+ WARN_ON(cpu_is_offline(cpu));
send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
}

@@ -528,5 +529,7 @@ asmlinkage void smp_call_function_interrupt(void)
}
}

-struct smp_ops smp_ops;
+struct smp_ops smp_ops = {
+ .smp_send_reschedule = native_smp_send_reschedule,
+};
EXPORT_SYMBOL_GPL(smp_ops);
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index ee98bee..28f33c0 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -23,6 +23,11 @@ struct smp_ops {

#ifdef CONFIG_SMP
extern struct smp_ops smp_ops;
+
+static inline void smp_send_reschedule(int cpu)
+{
+ smp_ops.smp_send_reschedule(cpu);
+}
#endif

#ifdef CONFIG_X86_32
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 74755e8..c60a3dd 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -60,10 +60,6 @@ static inline void smp_send_stop(void)
{
smp_ops.smp_send_stop();
}
-static inline void smp_send_reschedule(int cpu)
-{
- smp_ops.smp_send_reschedule(cpu);
-}
static inline int smp_call_function_mask(cpumask_t mask,
void (*func) (void *info), void *info,
int wait)
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index 284f701..b920458 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -65,8 +65,6 @@ static inline int num_booting_cpus(void)
return cpus_weight(cpu_callout_map);
}

-extern void smp_send_reschedule(int cpu);
-
#else /* CONFIG_SMP */

extern unsigned int boot_cpu_id;
--
1.5.0.6


\
 
 \ /
  Last update: 2008-03-03 18:19    [W:0.081 / U:1.316 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site