summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/smp.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
commit116674acc97ba75a720329996877077d988443a2 (patch)
tree6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /include/asm-s390/smp.h
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'include/asm-s390/smp.h')
-rw-r--r--include/asm-s390/smp.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index d7f246bb7..2922f398a 100644
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -13,7 +13,7 @@
#ifndef __ASSEMBLY__
#include <asm/lowcore.h>
-#include <linux/tasks.h> // FOR NR_CPUS definition only.
+#include <linux/threads.h> // FOR NR_CPUS definition only.
#include <linux/kernel.h> // FOR FASTCALL definition
#define smp_processor_id() (current->processor)
@@ -31,7 +31,6 @@
#define PROC_CHANGE_PENALTY 20 /* Schedule penalty */
-extern unsigned long ipi_count;
extern void count_cpus(void);
extern __inline__ int cpu_logical_map(int cpu)
@@ -67,10 +66,11 @@ typedef struct
__u16 cpu;
} sigp_info;
-sigp_ccode smp_ext_call_sync(int cpu, ec_cmd_sig cmd,void *parms);
-sigp_ccode smp_ext_call_async(int cpu, ec_bit_sig sig);
-void smp_ext_call_sync_others(ec_cmd_sig cmd, void *parms);
-void smp_ext_call_async_others(ec_bit_sig sig);
+sigp_ccode
+smp_ext_call(int cpu, void (*callback)(void *info), void *info, int wait);
+void smp_ext_call_others(void (*callback)(void *info), void *info, int wait);
+sigp_ccode smp_ext_bitcall(int cpu, ec_bit_sig sig);
+void smp_ext_bitcall_others(ec_bit_sig sig);
int smp_signal_others(sigp_order_code order_code,__u32 parameter,
int spin,sigp_info *info);