diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
| commit | d033de5ceee8333e4fee3d59a956244d3736102a (patch) | |
| tree | 5bdebcac18ed67890571632570c324e0c41a7223 /include/linux/compiler.h | |
| parent | ASoC: topology: Change pass number of DAI smaller than graph (diff) | |
| parent | Linux 4.2-rc6 (diff) | |
| download | wireguard-linux-d033de5ceee8333e4fee3d59a956244d3736102a.tar.xz wireguard-linux-d033de5ceee8333e4fee3d59a956244d3736102a.zip | |
Merge tag 'v4.2-rc6' into asoc-topology
Linux 4.2-rc6
Diffstat (limited to '')
| -rw-r--r-- | include/linux/compiler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 7f8ad9593da7..e08a6ae7c0a4 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -17,11 +17,11 @@ # define __release(x) __context__(x,-1) # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0) # define __percpu __attribute__((noderef, address_space(3))) +# define __pmem __attribute__((noderef, address_space(5))) #ifdef CONFIG_SPARSE_RCU_POINTER # define __rcu __attribute__((noderef, address_space(4))) #else # define __rcu -# define __pmem __attribute__((noderef, address_space(5))) #endif extern void __chk_user_ptr(const volatile void __user *); extern void __chk_io_ptr(const volatile void __iomem *); |