Re: [GIT PULL] locking tree changes for v3.16

From: Peter Zijlstra
Date: Thu Jun 05 2014 - 08:53:28 EST


On Thu, Jun 05, 2014 at 01:11:10PM +0200, Ingo Molnar wrote:
> Unfortunately even with the latest bits from you the breakage I
> reported weeks ago is not resolved:
>
> In file included from include/linux/spinlock_types.h:15:0,
> from kernel/bounds.c:14:
> include/linux/spinlock_types_up.h:19:3: error: conflicting types for âarch_spinlock_tâ
> In file included from /home/mingo/linux/linux2/arch/x86/include/asm/paravirt_types.h:329:0,
> from /home/mingo/linux/linux2/arch/x86/include/asm/ptrace.h:64,
> from /home/mingo/linux/linux2/arch/x86/include/asm/alternative.h:8,
> from /home/mingo/linux/linux2/arch/x86/include/asm/bitops.h:16,
> from include/linux/bitops.h:33,
> from include/linux/kernel.h:10,
> from include/asm-generic/bug.h:13,
> from /home/mingo/linux/linux2/arch/x86/include/asm/bug.h:35,
> from include/linux/bug.h:4,
> from include/linux/page-flags.h:9,
> from kernel/bounds.c:9:

OK, That's UP + paravirt. The one I fixed a few weeks ago was SMP +
paravirt.

Lemme go kick some headers.

Attachment: pgps7NvvjD2lX.pgp
Description: PGP signature