android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2019-04-12 20:13:13 -07:00
parent 8ee15f3248 4fa5ecda2b
commit 54c63a7558
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/kernel.h
View File

@ -47,8 +47,8 @@
#define u64_to_user_ptr(x) ( \ #define u64_to_user_ptr(x) ( \
{ \ { \
typecheck(u64, x); \ typecheck(u64, (x)); \
(void __user *)(uintptr_t)x; \ (void __user *)(uintptr_t)(x); \
} \ } \
) )

1
tools/objtool/check.c
View File

@ -165,6 +165,7 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,
"fortify_panic", "fortify_panic",
"usercopy_abort", "usercopy_abort",
"machine_real_restart", "machine_real_restart",
"rewind_stack_do_exit",
}; };
if (func->bind == STB_WEAK) if (func->bind == STB_WEAK)