mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-25 10:59:05 +00:00
90a4c0f51e
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 d7e7528bcd ("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>
16 lines
271 B
C
16 lines
271 B
C
#ifndef __SYSDEP_X86_PTRACE_H
|
|
#define __SYSDEP_X86_PTRACE_H
|
|
|
|
#ifdef __i386__
|
|
#include "ptrace_32.h"
|
|
#else
|
|
#include "ptrace_64.h"
|
|
#endif
|
|
|
|
static inline long regs_return_value(struct uml_pt_regs *regs)
|
|
{
|
|
return UPT_SYSCALL_RET(regs);
|
|
}
|
|
|
|
#endif /* __SYSDEP_X86_PTRACE_H */
|