]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
arch/sparc: Remove the check #ifndef __LINUX_SPINLOCK_TYPES_H
authorBabu Moger <babu.moger@oracle.com>
Wed, 24 May 2017 23:55:09 +0000 (17:55 -0600)
committerAllen Pais <allen.pais@oracle.com>
Fri, 16 Jun 2017 08:46:54 +0000 (14:16 +0530)
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"

SPARC has this guard which causes compile error when spinlock_types.h
is included directly.
@ifndef __LINUX_SPINLOCK_TYPES_H
@ error "please don't include this file directly"
@endif

Remove this un-necessary "ifndef __LINUX_SPINLOCK_TYPES_H" stanza from SPARC.

Signed-off-by: Babu Moger <babu.moger@oracle.com>
Suggested-by: David Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 8b93b4a9e1be78930eb9d640f75818993f70e065)

Signed-off-by: Babu Moger <babu.moger@oracle.com>
Orabug: 26183741
Signed-off-by: Allen Pais <allen.pais@oracle.com>
arch/sparc/include/asm/spinlock_types.h

index 9c454fdeaad82a9cf0cdc63bd84ea78112fa0083..019c0855bf8bf4548c9234d829b753720a488ca6 100644 (file)
@@ -1,10 +1,6 @@
 #ifndef __SPARC_SPINLOCK_TYPES_H
 #define __SPARC_SPINLOCK_TYPES_H
 
-#ifndef __LINUX_SPINLOCK_TYPES_H
-# error "please don't include this file directly"
-#endif
-
 typedef struct {
        volatile unsigned char lock;
 } arch_spinlock_t;