diff options
| author | Dan Williams | 2016-07-24 17:05:44 +0200 |
|---|---|---|
| committer | Dan Williams | 2016-07-24 17:05:44 +0200 |
| commit | 0606263f24f3d64960de742c55894190b5df903b (patch) | |
| tree | 673894f227c1a761f601ad7bdc1ceef003bb85cb /include/linux/compiler.h | |
| parent | nfit: make DIMM DSMs optional (diff) | |
| parent | libnvdimm-btt: Delete an unnecessary check before the function call "__nd_dev... (diff) | |
| download | kernel-qcow2-linux-0606263f24f3d64960de742c55894190b5df903b.tar.gz kernel-qcow2-linux-0606263f24f3d64960de742c55894190b5df903b.tar.xz kernel-qcow2-linux-0606263f24f3d64960de742c55894190b5df903b.zip | |
Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 793c0829e3a3..b966974938ed 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -17,7 +17,6 @@ # 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 /* CONFIG_SPARSE_RCU_POINTER */ @@ -45,7 +44,6 @@ extern void __chk_io_ptr(const volatile void __iomem *); # define __cond_lock(x,c) (c) # define __percpu # define __rcu -# define __pmem # define __private # define ACCESS_PRIVATE(p, member) ((p)->member) #endif /* __CHECKER__ */ |