Commit 4d6a1982 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge our fixes branch again, this has a couple of build fixes and also
a change to do_syscall_trace_enter() that will conflict with a patch we
want to apply in next.
parents 7c91efce a225f156

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ $(obj)/empty.c: 
$(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S

	$(Q)cp $< $@



$(obj)/serial.c: $(obj)/autoconf.h

$(srctree)/$(src)/serial.c: $(obj)/autoconf.h



$(obj)/autoconf.h: $(obj)/%: $(objtree)/include/generated/%

	$(Q)cp $< $@

arch/powerpc/boot/crt0.S

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
RELA = 7

RELACOUNT = 0x6ffffff9



	.text

	.data

	/* A procedure descriptor used when booting this as a COFF file.

	 * When making COFF, this comes first in the link and we're

	 * linked at 0x500000.
@@ -23,6 +23,8 @@ RELACOUNT = 0x6ffffff9 
	.globl	_zimage_start_opd

_zimage_start_opd:

	.long	0x500000, 0, 0, 0

	.text

	b	_zimage_start



#ifdef __powerpc64__

.balign 8

arch/powerpc/include/asm/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <asm/ptrace.h>

#include <asm/reg.h>



#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs



/*

 * Overload regs->result to specify whether we should use the MSR (result

 * is zero) or the SIAR (result is non zero).

arch/powerpc/include/uapi/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



generic-y += bpf_perf_event.h

generic-y += param.h

generic-y += poll.h

generic-y += resource.h

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

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

#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__ */