Commit 5e46caf6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 2451d1e5 16c5055a
...@@ -47,7 +47,7 @@ static inline void clear_page(void *page) ...@@ -47,7 +47,7 @@ static inline void clear_page(void *page)
clear_page_erms, X86_FEATURE_ERMS, clear_page_erms, X86_FEATURE_ERMS,
"=D" (page), "=D" (page),
"0" (page) "0" (page)
: "memory", "rax", "rcx"); : "cc", "memory", "rax", "rcx");
} }
void copy_page(void *to, void *from); void copy_page(void *to, void *from);
......
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/cpufeatures.h>
#include <asm/alternative-asm.h>
#include <asm/export.h> #include <asm/export.h>
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment