Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (5e46caf6) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

arch/x86/lib/clear_page_64.S

+0 −2

Original line number	Diff line number	Diff line
		#include <linux/linkage.h>
		#include <asm/cpufeatures.h>
		#include <asm/alternative-asm.h>
		#include <asm/export.h>

		/*

Admin message