diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-13 06:13:13 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-13 06:13:13 +0300 |
| commit | 54c63a75581f4b8d5d4b5660424f926510cfd98c (patch) | |
| tree | 62f1528eeb5d2142e5496beeb709408a7fca3a71 /include | |
| parent | 8ee15f3248660f85102a47410079d408615723d4 (diff) | |
| parent | 4fa5ecda2bf96be7464eb406df8aba9d89260227 (diff) | |
| download | linux-54c63a75581f4b8d5d4b5660424f926510cfd98c.tar.xz | |
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()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kernel.h | 4 |
1 files changed, 2 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); \ } \ ) |