summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/rmwcc.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-12-01 10:32:48 +0100
committerIngo Molnar <mingo@kernel.org>2017-12-17 12:58:53 +0100
commit0fd2e9c53d82704a3ba87ea1980ec515188c5316 (patch)
treea828c396110053feba9e65307a4e802b00966519 /arch/x86/include/asm/rmwcc.h
parent1784f9144b143a1e8b19fe94083b040aa559182b (diff)
parent1e4c4f610f774df6088d7c065b2dd4d22adba698 (diff)
downloadop-kernel-dev-0fd2e9c53d82704a3ba87ea1980ec515188c5316.zip
op-kernel-dev-0fd2e9c53d82704a3ba87ea1980ec515188c5316.tar.gz
Merge commit 'upstream-x86-entry' into WIP.x86/mm
Pull in a minimal set of v4.15 entry code changes, for a base for the MM isolation patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/rmwcc.h')
-rw-r--r--arch/x86/include/asm/rmwcc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
index d8f3a6a..f91c365 100644
--- a/arch/x86/include/asm/rmwcc.h
+++ b/arch/x86/include/asm/rmwcc.h
@@ -29,7 +29,7 @@ cc_label: \
#define __GEN_RMWcc(fullop, var, cc, clobbers, ...) \
do { \
bool c; \
- asm volatile (fullop ";" CC_SET(cc) \
+ asm volatile (fullop CC_SET(cc) \
: [counter] "+m" (var), CC_OUT(cc) (c) \
: __VA_ARGS__ : clobbers); \
return c; \
OpenPOWER on IntegriCloud