lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] Fix __ctl_load/__ctl_store inline assembly constraints

Browse Source 
__ctl_load/__ctl_store are called with either an array of unsigned long or
a single unsigned long value. Add an address operator to the "m"/"=m"
contraints to make them work for unsigned long arguments as well.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky
2008-06-10 10:03:24 +02:00
parent 24d3e210c1
commit b57838ea3f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asm-s390/system.h
View File

@@ -315,14 +315,14 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
asm volatile( \ asm volatile( \
" lctlg %1,%2,0(%0)\n" \ " lctlg %1,%2,0(%0)\n" \
: : "a" (&array), "i" (low), "i" (high), \ : : "a" (&array), "i" (low), "i" (high), \
"m" (*(addrtype *)(array))); \ "m" (*(addrtype *)(&array))); \
}) })
#define __ctl_store(array, low, high) ({ \ #define __ctl_store(array, low, high) ({ \
typedef struct { char _[sizeof(array)]; } addrtype; \ typedef struct { char _[sizeof(array)]; } addrtype; \
asm volatile( \ asm volatile( \
" stctg %2,%3,0(%1)\n" \ " stctg %2,%3,0(%1)\n" \
: "=m" (*(addrtype *)(array)) \ : "=m" (*(addrtype *)(&array)) \
: "a" (&array), "i" (low), "i" (high)); \ : "a" (&array), "i" (low), "i" (high)); \
}) })
@@ -333,14 +333,14 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
asm volatile( \ asm volatile( \
" lctl %1,%2,0(%0)\n" \ " lctl %1,%2,0(%0)\n" \
: : "a" (&array), "i" (low), "i" (high), \ : : "a" (&array), "i" (low), "i" (high), \
"m" (*(addrtype *)(array))); \ "m" (*(addrtype *)(&array))); \
}) })
#define __ctl_store(array, low, high) ({ \ #define __ctl_store(array, low, high) ({ \
typedef struct { char _[sizeof(array)]; } addrtype; \ typedef struct { char _[sizeof(array)]; } addrtype; \
asm volatile( \ asm volatile( \
" stctl %2,%3,0(%1)\n" \ " stctl %2,%3,0(%1)\n" \
: "=m" (*(addrtype *)(array)) \ : "=m" (*(addrtype *)(&array)) \
: "a" (&array), "i" (low), "i" (high)); \ : "a" (&array), "i" (low), "i" (high)); \
}) })