Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Apr 2018 21:06:47 +0000 (14:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Apr 2018 21:06:47 +0000 (14:06 -0700)
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()

arch/x86/include/asm/page_64.h
arch/x86/lib/clear_page_64.S

index d652a38080659775ef145d089291bde353ffe97a..9ca8dae9c716f7319d7ae157e9f0109eb691694a 100644 (file)
@@ -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);
index 81b1635d67dee9624de37e1f4577a36e9b7065cb..88acd349911bec600bf30646ec6077423c279759 100644 (file)
@@ -1,6 +1,4 @@
 #include <linux/linkage.h>
-#include <asm/cpufeatures.h>
-#include <asm/alternative-asm.h>
 #include <asm/export.h>
 
 /*