summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-25 20:11:26 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-25 20:11:26 +0300
commit57cb635c5cb6eea54af02aea5edd003b6b2715a7 (patch)
tree8439f50f6a732cb1368508bf2739ed3f7a85a510 /drivers
parentced255c0c5fb9ab52c9465982f23b1c14005ef8b (diff)
parentd6eb71a6d2eda21c8cd7a4dcd6207a0d94eb6ae7 (diff)
downloadlinux-57cb635c5cb6eea54af02aea5edd003b6b2715a7.tar.xz
Merge tag 'powerpc-4.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: - Wire up sys_membarrier() - cxl: Fix lockdep warning while creating afu_err_buff from Vaibhav * tag 'powerpc-4.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: cxl: Fix lockdep warning while creating afu_err_buff attribute powerpc: Wire up sys_membarrier()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/cxl/sysfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
index 25868c2ec03e..02006f7109a8 100644
--- a/drivers/misc/cxl/sysfs.c
+++ b/drivers/misc/cxl/sysfs.c
@@ -592,6 +592,8 @@ int cxl_sysfs_afu_add(struct cxl_afu *afu)
/* conditionally create the add the binary file for error info buffer */
if (afu->eb_len) {
+ sysfs_attr_init(&afu->attr_eb.attr);
+
afu->attr_eb.attr.name = "afu_err_buff";
afu->attr_eb.attr.mode = S_IRUGO;
afu->attr_eb.size = afu->eb_len;