Re: linux-next: Tree for Jan 19 (uml)

[Stephen Rothwell]

On Wed, 18 Jan 2012 19:07:24 -0800 Randy Dunlap <rdunlap@xxxxxxxxxxxx> wrote:
>
> Building uml on x86_64 gives:
> 
>   CC      arch/um/kernel/asm-offsets.s
> In file included from /next/linux-next-20120119/arch/um/include/shared/registers.h:9:0,
>                  from /next/linux-next-20120119/arch/um/include/asm/processor-generic.h:14,
>                  from /next/linux-next-20120119/arch/x86/um/asm/processor.h:20,
>                  from /next/linux-next-20120119/arch/um/include/asm/uaccess.h:16,
>                  from /next/linux-next-20120119/arch/um/include/asm/thread_info.h:13,
>                  from /next/linux-next-20120119/include/linux/thread_info.h:53,
>                  from /next/linux-next-20120119/include/linux/preempt.h:9,
>                  from /next/linux-next-20120119/include/linux/spinlock.h:50,
>                  from /next/linux-next-20120119/include/linux/seqlock.h:29,
>                  from /next/linux-next-20120119/include/linux/time.h:8,
>                  from /next/linux-next-20120119/include/linux/timex.h:56,
>                  from /next/linux-next-20120119/include/linux/sched.h:57,
>                  from /next/linux-next-20120119/arch/x86/um/shared/sysdep/kernel-offsets.h:2,
>                  from /next/linux-next-20120119/arch/um/kernel/asm-offsets.c:1:
> /next/linux-next-20120119/arch/x86/um/shared/sysdep/ptrace.h:7:20: error: redefinition of 'regs_return_value'
> /next/linux-next-20120119/arch/x86/um/shared/sysdep/ptrace.h:7:20: note: previous definition of 'regs_return_value' was here

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.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature