diff options
Diffstat (limited to 'include/asm-s390/processor.h')
| -rw-r--r-- | include/asm-s390/processor.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h index c5cbc4bd8414..5b71d3731723 100644 --- a/include/asm-s390/processor.h +++ b/include/asm-s390/processor.h | |||
| @@ -199,15 +199,13 @@ unsigned long get_wchan(struct task_struct *p); | |||
| 199 | /* | 199 | /* |
| 200 | * Give up the time slice of the virtual PU. | 200 | * Give up the time slice of the virtual PU. |
| 201 | */ | 201 | */ |
| 202 | #ifndef __s390x__ | 202 | static inline void cpu_relax(void) |
| 203 | # define cpu_relax() asm volatile ("diag 0,0,68" : : : "memory") | 203 | { |
| 204 | #else /* __s390x__ */ | 204 | if (MACHINE_HAS_DIAG44) |
| 205 | # define cpu_relax() \ | 205 | asm volatile ("diag 0,0,68" : : : "memory"); |
| 206 | do { \ | 206 | else |
| 207 | if (MACHINE_HAS_DIAG44) \ | 207 | barrier(); |
| 208 | asm volatile ("diag 0,0,68" : : : "memory"); \ | 208 | } |
| 209 | } while (0) | ||
| 210 | #endif /* __s390x__ */ | ||
| 211 | 209 | ||
| 212 | /* | 210 | /* |
| 213 | * Set PSW to specified value. | 211 | * Set PSW to specified value. |