summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorGerald Schaefer <geraldsc@de.ibm.com>2005-07-29 23:03:38 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-30 00:01:15 +0200
commitb87a1e506115e7df4c6bfd266267ee0088cba3b7 (patch)
tree1f5e16a6478aaf58db89cc889568e36accb00d5f /arch/s390
parent[PATCH] s390: device recognition (diff)
downloadlinux-b87a1e506115e7df4c6bfd266267ee0088cba3b7.tar.xz
linux-b87a1e506115e7df4c6bfd266267ee0088cba3b7.zip
[PATCH] s390: fix inline assembly in appldata
Fix inline assembly that gets miscompiled by gcc 4. Signed-off-by: Gerald Schaefer <geraldsc@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/appldata/appldata_base.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index c067435bae45..c9f2f60cfa58 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -232,7 +232,11 @@ static int appldata_diag(char record_nr, u16 function, unsigned long buffer,
ry = -1;
asm volatile(
"diag %1,%0,0xDC\n\t"
- : "=d" (ry) : "d" (&(appldata_parameter_list)) : "cc");
+ : "=d" (ry)
+ : "d" (&appldata_parameter_list),
+ "m" (appldata_parameter_list),
+ "m" (appldata_product_id)
+ : "cc");
return (int) ry;
}
/************************ timer, work, DIAG <END> ****************************/