diff options
Diffstat (limited to 'include/asm-s390/smp.h')
-rw-r--r-- | include/asm-s390/smp.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h index 6f3821a6a90..ae89cf2478f 100644 --- a/include/asm-s390/smp.h +++ b/include/asm-s390/smp.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/lowcore.h> | 19 | #include <asm/lowcore.h> |
20 | #include <asm/sigp.h> | 20 | #include <asm/sigp.h> |
21 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
22 | #include <asm/system.h> | ||
22 | 23 | ||
23 | /* | 24 | /* |
24 | s390 specific smp.c headers | 25 | s390 specific smp.c headers |
@@ -53,10 +54,7 @@ extern void machine_power_off_smp(void); | |||
53 | 54 | ||
54 | static inline __u16 hard_smp_processor_id(void) | 55 | static inline __u16 hard_smp_processor_id(void) |
55 | { | 56 | { |
56 | __u16 cpu_address; | 57 | return stap(); |
57 | |||
58 | asm volatile("stap %0" : "=m" (cpu_address)); | ||
59 | return cpu_address; | ||
60 | } | 58 | } |
61 | 59 | ||
62 | /* | 60 | /* |
@@ -108,5 +106,11 @@ static inline void smp_send_stop(void) | |||
108 | #define smp_cpu_not_running(cpu) 1 | 106 | #define smp_cpu_not_running(cpu) 1 |
109 | #endif | 107 | #endif |
110 | 108 | ||
109 | #ifdef CONFIG_HOTPLUG_CPU | ||
110 | extern int smp_rescan_cpus(void); | ||
111 | #else | ||
112 | static inline int smp_rescan_cpus(void) { return 0; } | ||
113 | #endif | ||
114 | |||
111 | extern union save_area *zfcpdump_save_areas[NR_CPUS + 1]; | 115 | extern union save_area *zfcpdump_save_areas[NR_CPUS + 1]; |
112 | #endif | 116 | #endif |