tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds 57cb635c ced255c0

+5 -1
+1
arch/powerpc/include/asm/systbl.h
··· 369 369 COMPAT_SYS(execveat) 370 370 PPC64ONLY(switch_endian) 371 371 SYSCALL_SPU(userfaultfd) 372 + SYSCALL_SPU(membarrier)
+1 -1
arch/powerpc/include/asm/unistd.h
··· 12 12 #include <uapi/asm/unistd.h> 13 13 14 14 15 - #define __NR_syscalls 365 15 + #define __NR_syscalls 366 16 16 17 17 #define __NR__exit __NR_exit 18 18 #define NR_syscalls __NR_syscalls
+1
arch/powerpc/include/uapi/asm/unistd.h
··· 387 387 #define __NR_execveat 362 388 388 #define __NR_switch_endian 363 389 389 #define __NR_userfaultfd 364 390 + #define __NR_membarrier 365 390 391 391 392 #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
+2
drivers/misc/cxl/sysfs.c
··· 592 592 593 593 /* conditionally create the add the binary file for error info buffer */ 594 594 if (afu->eb_len) { 595 + sysfs_attr_init(&afu->attr_eb.attr); 596 + 595 597 afu->attr_eb.attr.name = "afu_err_buff"; 596 598 afu->attr_eb.attr.mode = S_IRUGO; 597 599 afu->attr_eb.size = afu->eb_len;