Skip to content

Commit 90a4c0f

Browse files
committed
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 d7e7528 ("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 <[email protected]> Analyzed-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent f59e842 commit 90a4c0f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

arch/x86/um/shared/sysdep/ptrace.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef __SYSDEP_X86_PTRACE_H
2+
#define __SYSDEP_X86_PTRACE_H
3+
14
#ifdef __i386__
25
#include "ptrace_32.h"
36
#else
@@ -8,3 +11,5 @@ static inline long regs_return_value(struct uml_pt_regs *regs)
811
{
912
return UPT_SYSCALL_RET(regs);
1013
}
14+
15+
#endif /* __SYSDEP_X86_PTRACE_H */

0 commit comments

Comments
 (0)