Commit 7e74dabc authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge our fixes branch. In particular this brings in commit
98648161 ("powerpc/book3e: Fix PUD allocation size in
map_kernel_page()") which fixes a build failure in next, because commit
2db2008e ("powerpc/64e: Rewrite p4d_populate() as a static inline
function") depends on it.
parents 54c15ec3 88750282

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -360,6 +360,10 @@ config ARCH_SUSPEND_NONZERO_CPU 
	def_bool y

	depends on PPC_POWERNV || PPC_PSERIES



config ARCH_HAS_ADD_PAGES

	def_bool y

	depends on ARCH_ENABLE_MEMORY_HOTPLUG



config PPC_DCR_NATIVE

	bool

arch/powerpc/include/asm/bpf_perf_event.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_BPF_PERF_EVENT_H

#define _ASM_POWERPC_BPF_PERF_EVENT_H



#include <asm/ptrace.h>



typedef struct user_pt_regs bpf_user_pt_regs_t;



#endif /* _ASM_POWERPC_BPF_PERF_EVENT_H */

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

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__

#define _UAPI__ASM_BPF_PERF_EVENT_H__



#include <asm/ptrace.h>



typedef struct user_pt_regs bpf_user_pt_regs_t;



#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */

arch/powerpc/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -1855,7 +1855,7 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) 
		tm_reclaim_current(0);

#endif



	memset(regs->gpr, 0, sizeof(regs->gpr));

	memset(&regs->gpr[1], 0, sizeof(regs->gpr) - sizeof(regs->gpr[0]));

	regs->ctr = 0;

	regs->link = 0;

	regs->xer = 0;

arch/powerpc/kernel/prom_init.c

+1 −1
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ static void __init prom_init_stdout(void) 


static int __init prom_find_machine_type(void)

{

	char compat[256];

	static char compat[256] __prombss;

	int len, i = 0;

#ifdef CONFIG_PPC64

	phandle rtas;