summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-02 14:06:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-02 14:06:47 -0700
commit5e46caf62d8910f6999fd378b743b9c0e1b21cf9 (patch)
treee9e7955fab46c552711de9f20e3e33aabbf9b3f2 /arch/x86/include
parent2451d1e59d5a154a42bcf02e0bfeebb01d8df1e0 (diff)
parent16c5055a5ff5e1ff13c5211e44514a2b1d2c1dae (diff)
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 asm fixlets from Ingo Molnar: "A clobber list fix and cleanups" * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/asm: Trim clear_page.S includes x86/asm: Clobber flags in clear_page()
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/page_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index d652a3808065..9ca8dae9c716 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -47,7 +47,7 @@ static inline void clear_page(void *page)
clear_page_erms, X86_FEATURE_ERMS,
"=D" (page),
"0" (page)
- : "memory", "rax", "rcx");
+ : "cc", "memory", "rax", "rcx");
}
void copy_page(void *to, void *from);