Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (54c63a75) · Commits · 戴 / test

Pull core fixes from Ingo Molnar: "Fix an objtool warning plus fix a u64_to_user_ptr() macro expansion bug" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Add rewind_stack_do_exit() to the noreturn list linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()

include/linux/kernel.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,8 +47,8 @@

		#define u64_to_user_ptr(x) ( \
		{ \
		typecheck(u64, x); \
		(void __user *)(uintptr_t)x; \
		typecheck(u64, (x)); \
		(void __user *)(uintptr_t)(x); \
		} \
		)

tools/objtool/check.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ static int __dead_end_function(struct objtool_file file, struct symbol func,
		"fortify_panic",
		"usercopy_abort",
		"machine_real_restart",
		"rewind_stack_do_exit",
		};

		if (func->bind == STB_WEAK)

Admin message