Linus Torvalds 90a4c0f51e 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>

2012-01-18 19:26:11 -08:00

..

asm

fix braino in um patchset (mea culpa)

2011-11-21 12:10:21 -08:00

os-Linux

um: we need sys/user.h only on i386

2011-11-02 14:15:38 +01:00

shared/sysdep

uml: fix compile for x86-64

2012-01-18 19:26:11 -08:00

vdso

um: Fix kmalloc argument order in um/vdso/vma.c

2011-11-02 14:15:42 +01:00

bug.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

bugs_32.c

um: kill shared/task.h and HOST_TASK_REGS

2011-11-02 14:15:08 +01:00

bugs_64.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

checksum_32.S

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

delay.c

um: merge delay_{32,64}.c

2011-11-02 14:15:37 +01:00

elfcore.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

fault.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

Kconfig

mm,x86,um: move CMPXCHG_DOUBLE config option

2012-01-12 20:13:03 -08:00

ksyms.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

ldt.c

um: take ldt.h to arch/x86/um/asm/mm_context.h

2011-11-02 14:15:21 +01:00

Makefile

x86, um: Use the same style generated syscall tables as native

2011-12-05 16:08:49 -08:00

mem_32.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

mem_64.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

ptrace_32.c

um: merge HOST_... of registers common on i386 and amd64

2011-11-02 14:15:18 +01:00

ptrace_64.c

um: unify ptrace_user.h

2011-11-02 14:15:27 +01:00

ptrace_user.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

setjmp_32.S

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

setjmp_64.S

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

signal.c

um: merge signal_{32,64}.c

2011-11-02 14:15:20 +01:00

stub_32.S

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

stub_64.S

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

stub_segv.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

sys_call_table_32.c

x86, um: Fix typo in 32-bit system call modifications

2011-12-09 11:13:59 -08:00

sys_call_table_64.c

x86, um: Mark system call tables readonly

2011-12-05 22:56:38 -08:00

syscalls_32.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

syscalls_64.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

sysrq_32.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

sysrq_64.c

um: merge signal_{32,64}.c

2011-11-02 14:15:20 +01:00

tls_32.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

tls_64.c

um: take arch/um/sys-x86 to arch/x86/um

2011-11-02 14:15:05 +01:00

user-offsets.c

x86, um: Use the same style generated syscall tables as native

2011-12-05 16:08:49 -08:00