diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-13 05:13:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-13 05:13:13 +0200 |
| commit | 54c63a75581f4b8d5d4b5660424f926510cfd98c (patch) | |
| tree | 62f1528eeb5d2142e5496beeb709408a7fca3a71 | |
| parent | Merge tag 'dma-mapping-5.1-1' of git://git.infradead.org/users/hch/dma-mapping (diff) | |
| parent | objtool: Add rewind_stack_do_exit() to the noreturn list (diff) | |
| download | linux-54c63a75581f4b8d5d4b5660424f926510cfd98c.tar.xz linux-54c63a75581f4b8d5d4b5660424f926510cfd98c.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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()
| -rw-r--r-- | include/linux/kernel.h | 4 | ||||
| -rw-r--r-- | tools/objtool/check.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 34a5036debd3..2d14e21c16c0 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -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); \ } \ ) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 5dde107083c6..479196aeb409 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -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) |