diff options
| author | Linus Torvalds | 2018-04-02 14:06:47 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-02 14:06:47 -0700 |
| commit | 5e46caf62d8910f6999fd378b743b9c0e1b21cf9 (patch) | |
| tree | e9e7955fab46c552711de9f20e3e33aabbf9b3f2 | |
| parent | 2451d1e59d5a154a42bcf02e0bfeebb01d8df1e0 (diff) | |
| parent | 16c5055a5ff5e1ff13c5211e44514a2b1d2c1dae (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()
| -rw-r--r-- | arch/x86/include/asm/page_64.h | 2 | ||||
| -rw-r--r-- | arch/x86/lib/clear_page_64.S | 2 |
2 files changed, 1 insertions, 3 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); diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S index 81b1635d67de..88acd349911b 100644 --- a/arch/x86/lib/clear_page_64.S +++ b/arch/x86/lib/clear_page_64.S @@ -1,6 +1,4 @@ #include <linux/linkage.h> -#include <asm/cpufeatures.h> -#include <asm/alternative-asm.h> #include <asm/export.h> /* |