diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-15 11:00:12 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-15 11:01:06 +0300 |
| commit | 8bc6782fe20bd2584c73a35c47329c9fd0a8d34c (patch) | |
| tree | c7fc6f467ee212e4ef442e70843c48fcf3c67c17 /include/linux/compiler.h | |
| parent | e23604edac2a7be6a8808a5d13fac6b9df4eb9a8 (diff) | |
| parent | 3500efae4410454522697c94c23fc40323c0cee9 (diff) | |
| download | linux-8bc6782fe20bd2584c73a35c47329c9fd0a8d34c.tar.xz | |
Merge commit 'fixes.2015.02.23a' into core/rcu
Conflicts:
kernel/rcu/tree.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index a27f4f17c382..b5ff9881bef8 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -20,12 +20,14 @@ # define __pmem __attribute__((noderef, address_space(5))) #ifdef CONFIG_SPARSE_RCU_POINTER # define __rcu __attribute__((noderef, address_space(4))) -#else +#else /* CONFIG_SPARSE_RCU_POINTER */ # define __rcu -#endif +#endif /* CONFIG_SPARSE_RCU_POINTER */ +# define __private __attribute__((noderef)) extern void __chk_user_ptr(const volatile void __user *); extern void __chk_io_ptr(const volatile void __iomem *); -#else +# define ACCESS_PRIVATE(p, member) (*((typeof((p)->member) __force *) &(p)->member)) +#else /* __CHECKER__ */ # define __user # define __kernel # define __safe @@ -44,7 +46,9 @@ extern void __chk_io_ptr(const volatile void __iomem *); # define __percpu # define __rcu # define __pmem -#endif +# define __private +# define ACCESS_PRIVATE(p, member) ((p)->member) +#endif /* __CHECKER__ */ /* Indirect macros required for expanded argument pasting, eg. __LINE__. */ #define ___PASTE(a,b) a##b |