tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

uml: fix compile for x86-64

Randy Dunlap reports that we get

arch/x86/um/shared/sysdep/ptrace.h:7:20: error: redefinition of 'regs_return_value'
arch/x86/um/shared/sysdep/ptrace.h:7:20: note: previous definition of 'regs_return_value' was here

when compiling UML for x86-64.

Stephen Rothwell root-caused it and says:

"Caused by commit d7e7528bcd45 ("Audit: push audit success and retcode
into arch ptrace.h") (another patch that was never in linux-next :-().

This file now needs protection against double inclusion."

so let's do as the man says.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Analyzed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Linus Torvalds 90a4c0f5 f59e842f

+5
+5
arch/x86/um/shared/sysdep/ptrace.h
··· 1 + #ifndef __SYSDEP_X86_PTRACE_H 2 + #define __SYSDEP_X86_PTRACE_H 3 + 1 4 #ifdef __i386__ 2 5 #include "ptrace_32.h" 3 6 #else ··· 11 8 { 12 9 return UPT_SYSCALL_RET(regs); 13 10 } 11 + 12 + #endif /* __SYSDEP_X86_PTRACE_H */