diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-01 09:12:25 +0100 |
| commit | ed5c8c854f2b990dfa4d85c4995d115768a05d3c (patch) | |
| tree | a4a826795ec6784f25bebade98bdb20121d9c211 /arch/s390/include | |
| parent | 619bd4a71874a8fd78eb6ccf9f272c5e98bcc7b7 (diff) | |
| parent | a2ca3d617944417e9dd5f09fc8a4549cda115f4f (diff) | |
| download | op-kernel-dev-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.zip op-kernel-dev-ed5c8c854f2b990dfa4d85c4995d115768a05d3c.tar.gz | |
Merge branch 'linus' into sched/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/ctl_reg.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h index d7697ab..8e136b88 100644 --- a/arch/s390/include/asm/ctl_reg.h +++ b/arch/s390/include/asm/ctl_reg.h @@ -15,7 +15,9 @@ BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\ asm volatile( \ " lctlg %1,%2,%0\n" \ - : : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high));\ + : \ + : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high) \ + : "memory"); \ } #define __ctl_store(array, low, high) { \ |
