Changeset d71331b in mainline

Timestamp:

2012-07-01T20:54:53Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1f8c11f

Parents:

2ee1ccc

Message:

smp_call: Moved content of arch header to generic header.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/amd64/src/smp/smp_call.c (modified) (1 diff, 1 prop)
• arch/ia32/include/smp/smp_call.h (deleted)
• arch/ia32/src/smp/smp_call.c (modified) (2 diffs)
• generic/include/smp/smp_call.h (modified) (1 diff)
• generic/src/smp/smp_call.c (modified) (6 diffs)

kernel/Makefile

@@ -308 +308 @@
                 test/print/print4.c \
                 test/print/print5.c \
-                test/thread/thread1.c
+                test/thread/thread1.c \
+                test/smpcall/smpcall1.c
         
         ifeq ($(KARCH),mips32)

kernel/arch/amd64/src/smp/smp_call.c

@@ -1 @@
-#include <arch/smp/smp_call.h>
-#include <arch/smp/apic.h>
-#include <arch/interrupt.h>
-#include <cpu.h>
-
-
-void arch_smp_call_ipi(unsigned int cpu_id)
-{
-        (void) l_apic_send_custom_ipi(cpus[cpu_id].arch.id, VECTOR_SMP_CALL_IPI);
-}
-
+kernel/arch/ia32/src/smp/smp_call.c

kernel/arch/ia32/src/smp/smp_call.c

@@ -1 @@
-#include <arch/smp/smp_call.h>
+#include <smp/smp_call.h>
 #include <arch/smp/apic.h>
 #include <arch/interrupt.h>
 #include <cpu.h>
 
+#ifdef CONFIG_SMP
 
 void arch_smp_call_ipi(unsigned int cpu_id)
@@ -10 +11 @@
 }
 
+#endif /* CONFIG_SMP */
+

kernel/generic/include/smp/smp_call.h

@@ -23 +23 @@
 extern void smp_call_async(unsigned int, smp_call_func_t, void *, smp_call_t *);
 extern void smp_call_wait(smp_call_t *);
-//extern void smp_broadcast_call(smp_call_func_t, void *);
 
 extern void smp_call_init(void);
+
+#ifdef CONFIG_SMP
 extern void smp_call_ipi_recv(void);
+extern void arch_smp_call_ipi(unsigned int);
+#endif
+
 
 

kernel/generic/src/smp/smp_call.c

@@ -6 +6 @@
 #include <arch/barrier.h>
 #include <arch/asm.h>  /* interrupt_disable */
-#include <arch/smp/smp_call.h>
-
 
 
@@ -57 +55 @@
  * If @a cpu_id is the local CPU, the function will be invoked
  * directly.
+ * 
+ * Interrupts must be enabled. Otherwise you run the risk
+ * of a deadlock.
  * 
  * @param cpu_id Destination CPU's logical id (eg CPU->id)
@@ -105 +106 @@
 /** Waits for a function invoked on another CPU asynchronously to complete.
  * 
+ * Does not sleep but rather spins.
+ * 
  * Example usage:
  * @code
@@ -123 +126 @@
         call_wait(call_info);
 }
+
+#ifdef CONFIG_SMP
 
 /** Architecture independent smp call IPI handler.
@@ -152 +157 @@
 }
 
+#endif /* CONFIG_SMP */
 
 static void call_start(smp_call_t *call_info, smp_call_func_t func, void *arg)
@@ -194 +200 @@
 
 
-/*
-void smp_broadcast_call(smp_call_func_t func, void *arg)
-{
-}
-*/
-