]> git.baikalelectronics.ru Git - kernel.git/commit
uml: fix compile for x86-64
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 03:26:11 +0000 (19:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 03:26:11 +0000 (19:26 -0800)
commit01e1e3eac7c8b13d0f4dc4a59abbbbcd21736dfd
tree31253d716d1d677ab66b33094ffc8d737436c98d
parent69100639a681efb31ebf13e659d6868394219a63
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 fdd490e4ef7e ("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>
arch/x86/um/shared/sysdep/ptrace.h