* [PATCH] um: prctl: Do not include linux/ptrace.h
@ 2013-08-23 11:37 Richard Weinberger
2013-08-25 9:53 ` David Oberhollenzer
0 siblings, 1 reply; 2+ messages in thread
From: Richard Weinberger @ 2013-08-23 11:37 UTC (permalink / raw)
To: richard; +Cc: user-mode-linux-devel, linux-kernel, david.oberhollenzer
On recent toolchains we hit:
In file included from arch/x86/um/os-Linux/prctl.c:7:0:
/usr/include/linux/ptrace.h:58:8: error: redefinition of ‘struct
ptrace_peeksiginfo_args’ struct ptrace_peeksiginfo_args {
^
In file included from arch/x86/um/os-Linux/prctl.c:6:0:
/usr/include/sys/ptrace.h:191:8: note: originally defined here
struct ptrace_peeksiginfo_args
^
make[2]: *** [arch/x86/um/os-Linux/prctl.o] Error 1
make[1]: *** [arch/x86/um/os-Linux] Error 2
make: *** [arch/x86/um] Error 2
The solution is not to include linux/ptrace.h and obtain
the arch specific ptrace command from asm/ptrace.h.
Reported-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/x86/um/os-Linux/prctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/um/os-Linux/prctl.c b/arch/x86/um/os-Linux/prctl.c
index 9d34edd..96eb2bd 100644
--- a/arch/x86/um/os-Linux/prctl.c
+++ b/arch/x86/um/os-Linux/prctl.c
@@ -4,7 +4,7 @@
*/
#include <sys/ptrace.h>
-#include <linux/ptrace.h>
+#include <asm/ptrace.h>
int os_arch_prctl(int pid, int code, unsigned long *addr)
{
--
1.8.1.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] um: prctl: Do not include linux/ptrace.h
2013-08-23 11:37 [PATCH] um: prctl: Do not include linux/ptrace.h Richard Weinberger
@ 2013-08-25 9:53 ` David Oberhollenzer
0 siblings, 0 replies; 2+ messages in thread
From: David Oberhollenzer @ 2013-08-25 9:53 UTC (permalink / raw)
Cc: user-mode-linux-devel, linux-kernel
Tested-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-25 10:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-23 11:37 [PATCH] um: prctl: Do not include linux/ptrace.h Richard Weinberger
2013-08-25 9:53 ` David Oberhollenzer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome