s390: correct some inline assembly constraints

Inline assembly code changed in this patch should really use "Q"
constraint "Memory reference without index register and with short
displacement". The kernel does not compile with kasan support enabled
otherwise (due to stack instrumentation).

Signed-off-by: Vasily Gorbik <gor@linux.vnet.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h
index 05480e4..7364130 100644 (file)
--- a/arch/s390/include/asm/cpu_mf.h
+++ b/arch/s390/include/asm/cpu_mf.h
@@ -167,7 +167,7 @@ static inline int lcctl(u64 ctl)
                "       .insn   s,0xb2840000,%1\n"
                "       ipm     %0\n"
                "       srl     %0,28\n"
-               : "=d" (cc) : "m" (ctl) : "cc");
+               : "=d" (cc) : "Q" (ctl) : "cc");
        return cc;
 }
 

diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 2306fa1..ec6592e 100644 (file)
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -188,14 +188,14 @@ extern struct lowcore *lowcore_ptr[];
 
 static inline void set_prefix(__u32 address)
 {
-       asm volatile("spx %0" : : "m" (address) : "memory");
+       asm volatile("spx %0" : : "Q" (address) : "memory");
 }
 
 static inline __u32 store_prefix(void)
 {
        __u32 address;
 
-       asm volatile("stpx %0" : "=m" (address));
+       asm volatile("stpx %0" : "=Q" (address));
        return address;
 }
 

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 709351b..bfbfad4 100644 (file)
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -245,7 +245,7 @@ static inline unsigned short stap(void)
 {
        unsigned short cpu_address;
 
-       asm volatile("stap %0" : "=m" (cpu_address));
+       asm volatile("stap %0" : "=Q" (cpu_address));
        return cpu_address;
 }