This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-s390 / smp.h

diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index e992bd6..7e61324 100644 (file)
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -5,7 +5,6 @@
  *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com),
  *               Martin Schwidefsky (schwidefsky@de.ibm.com)
- *               Heiko Carstens (heiko.carstens@de.ibm.com)
  */
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
@@ -32,6 +31,10 @@ typedef struct
 
 extern int smp_call_function_on(void (*func) (void *info), void *info,
                                int nonatomic, int wait, int cpu);
+
+extern cpumask_t cpu_online_map;
+extern cpumask_t cpu_possible_map;
+
 #define NO_PROC_ID             0xFF            /* No processor magic marker */
 
 /*
@@ -48,8 +51,7 @@ extern int smp_call_function_on(void (*func) (void *info), void *info,
 
 #define smp_processor_id() (S390_lowcore.cpu_data.cpu_nr)
 
-extern int smp_get_cpu(cpumask_t cpu_map);
-extern void smp_put_cpu(int cpu);
+#define cpu_online(cpu) cpu_isset(cpu, cpu_online_map)
 
 extern __inline__ __u16 hard_smp_processor_id(void)
 {
@@ -61,23 +63,10 @@ extern __inline__ __u16 hard_smp_processor_id(void)
 
 #define cpu_logical_map(cpu) (cpu)
 
-extern int __cpu_disable (void);
-extern void __cpu_die (unsigned int cpu);
-extern void cpu_die (void) __attribute__ ((noreturn));
-extern int __cpu_up (unsigned int cpu);
-
 #endif
 
 #ifndef CONFIG_SMP
-static inline int
-smp_call_function_on(void (*func) (void *info), void *info,
-                    int nonatomic, int wait, int cpu)
-{
-       func(info);
-       return 0;
-}
-#define smp_get_cpu(cpu) ({ 0; })
-#define smp_put_cpu(cpu) ({ 0; })
+#define smp_call_function_on(func,info,nonatomic,wait,cpu)      ({ 0; })
 #endif
 
 #endif