Commit 90a4c0f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 d7e7528b

 ("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: default avatarRandy Dunlap <>
Analyzed-by: default avatarStephen Rothwell <>
Signed-off-by: default avatarLinus Torvalds <>
parent f59e842f
#ifndef __SYSDEP_X86_PTRACE_H
#define __SYSDEP_X86_PTRACE_H
#ifdef __i386__
#include "ptrace_32.h"
......@@ -8,3 +11,5 @@ static inline long regs_return_value(struct uml_pt_regs *regs)
return UPT_SYSCALL_RET(regs);
#endif /* __SYSDEP_X86_PTRACE_H */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment