Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux (19be9e8a) · Commits · 戴 / test

Pull powerpc updates from Michael Ellerman: "There's some bug fixes or cleanups to facilitate fixes, a MAINTAINERS update, and a new syscall (bpf)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: powerpc/numa: ensure per-cpu NUMA mappings are correct on topology update powerpc/numa: use cached value of update->cpu in update_cpu_topology cxl: Fix PSL error due to duplicate segment table entries powerpc/mm: Use appropriate ESID mask in copro_calculate_slb() cxl: Refactor cxl_load_segment() and find_free_sste() cxl: Disable secondary hash in segment table Revert "powerpc/powernv: Fix endian bug in LPC bus debugfs accessors" powernv: Use _GLOBAL_TOC for opal wrappers powerpc: Wire up sys_bpf() syscall MAINTAINERS: nx-842 driver maintainer change powerpc/mm: Remove redundant #if case powerpc/mm: Fix build error with hugetlfs disabled

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -4608,7 +4608,7 @@ S: Supported
		F: drivers/crypto/nx/

		IBM Power 842 compression accelerator
		M: Nathan Fontenot <nfont@linux.vnet.ibm.com>
		M: Dan Streetman <ddstreet@us.ibm.com>
		S: Supported
		F: drivers/crypto/nx/nx-842.c
		F: include/linux/nx842.h

arch/powerpc/include/asm/hugetlb.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ pte_t huge_pte_offset_and_shift(struct mm_struct mm,

		void flush_dcache_icache_hugepage(struct page *page);

		#if defined(CONFIG_PPC_MM_SLICES) \|\| defined(CONFIG_PPC_SUBPAGE_PROT)
		#if defined(CONFIG_PPC_MM_SLICES)
		int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
		unsigned long len);
		#else

arch/powerpc/include/asm/systbl.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -365,3 +365,4 @@ SYSCALL_SPU(renameat2)
		SYSCALL_SPU(seccomp)
		SYSCALL_SPU(getrandom)
		SYSCALL_SPU(memfd_create)
		SYSCALL_SPU(bpf)

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 361
		#define __NR_syscalls 362

		#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
		@@ -383,5 +383,6 @@
		#define __NR_seccomp 358
		#define __NR_getrandom 359
		#define __NR_memfd_create 360
		#define __NR_bpf 361

		#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */

Admin message