summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-09-22 22:58:47 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-09-22 22:58:45 +0200
commitbdd42b28cde0453fb8c3d9b4e4868ca2d8124806 (patch)
tree36d52f5021f308177e84affa1a2a5636c0b27778 /arch/s390
parent87458ff4582953d6b3bf45edeac8582849552e69 (diff)
downloadop-kernel-dev-bdd42b28cde0453fb8c3d9b4e4868ca2d8124806.zip
op-kernel-dev-bdd42b28cde0453fb8c3d9b4e4868ca2d8124806.tar.gz
[S390] fix disabled_wait inline assembly clobber list
The disabled_wait inline assmembly also clobbers register r1, but it is missing in the clobber list. Fixes recursive Oops on panic. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/processor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index cf8eed3..b427154 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -295,7 +295,7 @@ static inline void ATTRIB_NORET disabled_wait(unsigned long code)
" oi 0x384(1),0x10\n"/* fake protection bit */
" lpswe 0(%1)"
: "=m" (ctl_buf)
- : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0");
+ : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0", "1");
#endif /* __s390x__ */
while (1);
}
OpenPOWER on IntegriCloud