Re: [PATCH v2 1/7] kernel/locking: Fix compile error with qrwlock.c

From: David Miller
Date: Mon May 22 2017 - 15:03:40 EST


From: Babu Moger <babu.moger@xxxxxxxxxx>
Date: Fri, 19 May 2017 18:16:55 -0600

> Some architectures use the following guard in include file
> "asm/spinlock_types.h" to discourage including the file directly.
>
> Saw these compile errors on SPARC when queued rwlock feature is enabled.
>
> CC kernel/locking/qrwlock.o
> In file included from ./include/asm-generic/qrwlock_types.h:5,
> from ./arch/sparc/include/asm/qrwlock.h:4,
> from kernel/locking/qrwlock.c:24:
> ./arch/sparc/include/asm/spinlock_types.h:5:3: error:
> #error "please don't include this file directly"
>
> Re-arrange the includes in qrwlock_types.h and include spinlock.h
> in qrwlock.c to fix it.
>
> Also will be removing this stanza from SPARC. Stay tuned.
>
> Signed-off-by: Babu Moger <babu.moger@xxxxxxxxxx>
> Reviewed-by: Håkon Bugge <haakon.bugge@xxxxxxxxxx>
> Reviewed-by: Jane Chu <jane.chu@xxxxxxxxxx>
> Reviewed-by: Shannon Nelson <shannon.nelson@xxxxxxxxxx>
> Reviewed-by: Vijay Kumar <vijay.ac.kumar@xxxxxxxxxx>

In my feedback I said to remove that check from
sparc's asm/spinlock_types.h header.

Which you do in patch #2

But that means this patch #1 here is no longer necessary, since we
conform to the hearder scheme used by other architectures using queued
locks.

So please remove this patch from the series.

Thank you.