diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-s390/processor.h | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-s390/processor.h')
| -rw-r--r-- | include/asm-s390/processor.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h index 8bd14de69e35..4ec652ebb3b1 100644 --- a/include/asm-s390/processor.h +++ b/include/asm-s390/processor.h | |||
| @@ -203,7 +203,10 @@ unsigned long get_wchan(struct task_struct *p); | |||
| 203 | # define cpu_relax() asm volatile ("diag 0,0,68" : : : "memory") | 203 | # define cpu_relax() asm volatile ("diag 0,0,68" : : : "memory") |
| 204 | #else /* __s390x__ */ | 204 | #else /* __s390x__ */ |
| 205 | # define cpu_relax() \ | 205 | # define cpu_relax() \ |
| 206 | asm volatile ("ex 0,%0" : : "i" (__LC_DIAG44_OPCODE) : "memory") | 206 | do { \ |
| 207 | if (MACHINE_HAS_DIAG44) \ | ||
| 208 | asm volatile ("diag 0,0,68" : : : "memory"); \ | ||
| 209 | } while (0) | ||
| 207 | #endif /* __s390x__ */ | 210 | #endif /* __s390x__ */ |
| 208 | 211 | ||
| 209 | /* | 212 | /* |