]> git.baikalelectronics.ru Git - kernel.git/commit
arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h>
authorAnisse Astier <aastier@freebox.fr>
Mon, 17 Jun 2019 13:22:22 +0000 (15:22 +0200)
committerWill Deacon <will.deacon@arm.com>
Tue, 18 Jun 2019 13:36:26 +0000 (14:36 +0100)
commit0ec24f0bbd6b684438ca14c44b504f880f82d651
tree4ec4860f035c8eabe0f1ceaea7c2e95da838d9ac
parent77d38c1bb48ced570d962163c1e252433983eaa4
arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h>

Pulling linux/prctl.h into asm/ptrace.h in the arm64 UAPI headers causes
userspace build issues for any program (e.g. strace and qemu) that
includes both <sys/prctl.h> and <linux/ptrace.h> when using musl libc:

  | 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.

Although it's a bit grotty, fix this breakage by duplicating the prctl
constant definitions. Since these are part of the kernel ABI, they
cannot be changed in future and so it's not the end of the world to have
them open-coded.

Fixes: 33404b876e3d ("arm64/sve: ptrace and ELF coredump support")
Cc: stable@vger.kernel.org
Acked-by: Dave Martin <Dave.Martin@arm.com>
Signed-off-by: Anisse Astier <aastier@freebox.fr>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/include/uapi/asm/ptrace.h