diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-s390/smp.h | 2 | ||||
-rw-r--r-- | include/asm-s390/topology.h | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h index c7b74326a527..a464a66c65d3 100644 --- a/include/asm-s390/smp.h +++ b/include/asm-s390/smp.h | |||
@@ -90,6 +90,8 @@ extern void __cpu_die (unsigned int cpu); | |||
90 | extern void cpu_die (void) __attribute__ ((noreturn)); | 90 | extern void cpu_die (void) __attribute__ ((noreturn)); |
91 | extern int __cpu_up (unsigned int cpu); | 91 | extern int __cpu_up (unsigned int cpu); |
92 | 92 | ||
93 | extern struct mutex smp_cpu_state_mutex; | ||
94 | |||
93 | extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *), | 95 | extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *), |
94 | void *info, int wait); | 96 | void *info, int wait); |
95 | #endif | 97 | #endif |
diff --git a/include/asm-s390/topology.h b/include/asm-s390/topology.h index 613aa64019da..3b28a09a2108 100644 --- a/include/asm-s390/topology.h +++ b/include/asm-s390/topology.h | |||
@@ -1,6 +1,20 @@ | |||
1 | #ifndef _ASM_S390_TOPOLOGY_H | 1 | #ifndef _ASM_S390_TOPOLOGY_H |
2 | #define _ASM_S390_TOPOLOGY_H | 2 | #define _ASM_S390_TOPOLOGY_H |
3 | 3 | ||
4 | #include <linux/cpumask.h> | ||
5 | |||
6 | #define mc_capable() (1) | ||
7 | |||
8 | cpumask_t cpu_coregroup_map(unsigned int cpu); | ||
9 | |||
10 | #ifdef CONFIG_SMP | ||
11 | void s390_init_cpu_topology(void); | ||
12 | #else | ||
13 | static inline void s390_init_cpu_topology(void) | ||
14 | { | ||
15 | }; | ||
16 | #endif | ||
17 | |||
4 | #include <asm-generic/topology.h> | 18 | #include <asm-generic/topology.h> |
5 | 19 | ||
6 | #endif /* _ASM_S390_TOPOLOGY_H */ | 20 | #endif /* _ASM_S390_TOPOLOGY_H */ |