Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57cb635c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents ced255c0 d6eb71a6

arch/powerpc/include/asm/systbl.h

+1 −0
Original line number Diff line number Diff line
@@ -369,3 +369,4 @@ SYSCALL_SPU(bpf) 
COMPAT_SYS(execveat)

PPC64ONLY(switch_endian)

SYSCALL_SPU(userfaultfd)

SYSCALL_SPU(membarrier)

arch/powerpc/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <uapi/asm/unistd.h>





#define __NR_syscalls		365

#define __NR_syscalls		366



#define __NR__exit __NR_exit

#define NR_syscalls	__NR_syscalls

arch/powerpc/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -387,5 +387,6 @@ 
#define __NR_execveat		362

#define __NR_switch_endian	363

#define __NR_userfaultfd	364

#define __NR_membarrier		365



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */

drivers/misc/cxl/sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -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;