diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-16 12:02:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-16 12:02:43 +0200 |
| commit | 496156e3647f44e2aab3e64f86b63294afca458a (patch) | |
| tree | de4c35460ef0249623d45627ad40abad07b8e7cf /include/linux/kernel.h | |
| parent | cabf5ebbabcd4ad59b6eb216876c4c2e56fd3386 (diff) | |
| parent | 618d919cae2fcaadc752f27ddac8b939da8b441a (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kernel.h')
| -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); \ } \ ) |