On Mon, Jun 17, 2019 at 03:22:22PM +0200, Anisse Astier wrote: > Otherwise this will create userspace build issues for any program > (strace, qemu) that includes both <sys/prctl.h> (with musl libc) and > <linux/ptrace.h> (which then includes <asm/ptrace.h>), like this: > > error: redefinition of 'struct prctl_mm_map' > struct prctl_mm_map { > > See > https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 > for a public example of people working around this issue. > > Copying the defines is a bit imperfect here, but better than creating a > whole other header for just two defines that would never change, as part > of the kernel ABI. > > This patch depends on patch "arm64: ssbd: explicitly depend on > <linux/prctl.h>" for kernel >= 4.18 > > Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support") > Cc: sta...@vger.kernel.org > Signed-off-by: Anisse Astier <aast...@freebox.fr> > --- > arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-)
I've pushed these two out to the arm64 fixes branch [1], with Dave's Ack on this one. Note that I reworked the commit messages a bit to explain better what's going on. Cheers, Will [1] https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=for-next/fixes