| From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| Date: Fri, 4 Aug 2017 17:40:42 +0200 |
| Subject: [PATCH 1/2] locking: don't check for __LINUX_SPINLOCK_TYPES_H on -RT |
| archs |
| |
| Upstream uses arch_spinlock_t within spinlock_t and requests that |
| spinlock_types.h header file is included first. |
| On -RT we have the rt_mutex with its raw_lock wait_lock which needs |
| architectures' spinlock_types.h header file for its definition. However |
| we need rt_mutex first because it is used to build the spinlock_t so |
| that check does not work for us. |
| Therefore I am dropping that check. |
| |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| --- |
| arch/alpha/include/asm/spinlock_types.h | 4 ---- |
| arch/arm/include/asm/spinlock_types.h | 4 ---- |
| arch/arm64/include/asm/spinlock_types.h | 4 ---- |
| arch/hexagon/include/asm/spinlock_types.h | 4 ---- |
| arch/ia64/include/asm/spinlock_types.h | 4 ---- |
| arch/powerpc/include/asm/spinlock_types.h | 4 ---- |
| arch/s390/include/asm/spinlock_types.h | 4 ---- |
| arch/sh/include/asm/spinlock_types.h | 4 ---- |
| arch/xtensa/include/asm/spinlock_types.h | 4 ---- |
| include/linux/spinlock_types_up.h | 4 ---- |
| 10 files changed, 40 deletions(-) |
| |
| --- a/arch/alpha/include/asm/spinlock_types.h |
| +++ b/arch/alpha/include/asm/spinlock_types.h |
| @@ -2,10 +2,6 @@ |
| #ifndef _ALPHA_SPINLOCK_TYPES_H |
| #define _ALPHA_SPINLOCK_TYPES_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| typedef struct { |
| volatile unsigned int lock; |
| } arch_spinlock_t; |
| --- a/arch/arm/include/asm/spinlock_types.h |
| +++ b/arch/arm/include/asm/spinlock_types.h |
| @@ -2,10 +2,6 @@ |
| #ifndef __ASM_SPINLOCK_TYPES_H |
| #define __ASM_SPINLOCK_TYPES_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| #define TICKET_SHIFT 16 |
| |
| typedef struct { |
| --- a/arch/arm64/include/asm/spinlock_types.h |
| +++ b/arch/arm64/include/asm/spinlock_types.h |
| @@ -5,10 +5,6 @@ |
| #ifndef __ASM_SPINLOCK_TYPES_H |
| #define __ASM_SPINLOCK_TYPES_H |
| |
| -#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__ASM_SPINLOCK_H) |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| #include <asm-generic/qspinlock_types.h> |
| #include <asm-generic/qrwlock_types.h> |
| |
| --- a/arch/hexagon/include/asm/spinlock_types.h |
| +++ b/arch/hexagon/include/asm/spinlock_types.h |
| @@ -8,10 +8,6 @@ |
| #ifndef _ASM_SPINLOCK_TYPES_H |
| #define _ASM_SPINLOCK_TYPES_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| typedef struct { |
| volatile unsigned int lock; |
| } arch_spinlock_t; |
| --- a/arch/ia64/include/asm/spinlock_types.h |
| +++ b/arch/ia64/include/asm/spinlock_types.h |
| @@ -2,10 +2,6 @@ |
| #ifndef _ASM_IA64_SPINLOCK_TYPES_H |
| #define _ASM_IA64_SPINLOCK_TYPES_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| typedef struct { |
| volatile unsigned int lock; |
| } arch_spinlock_t; |
| --- a/arch/powerpc/include/asm/spinlock_types.h |
| +++ b/arch/powerpc/include/asm/spinlock_types.h |
| @@ -2,10 +2,6 @@ |
| #ifndef _ASM_POWERPC_SPINLOCK_TYPES_H |
| #define _ASM_POWERPC_SPINLOCK_TYPES_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| typedef struct { |
| volatile unsigned int slock; |
| } arch_spinlock_t; |
| --- a/arch/s390/include/asm/spinlock_types.h |
| +++ b/arch/s390/include/asm/spinlock_types.h |
| @@ -2,10 +2,6 @@ |
| #ifndef __ASM_SPINLOCK_TYPES_H |
| #define __ASM_SPINLOCK_TYPES_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| typedef struct { |
| int lock; |
| } __attribute__ ((aligned (4))) arch_spinlock_t; |
| --- a/arch/sh/include/asm/spinlock_types.h |
| +++ b/arch/sh/include/asm/spinlock_types.h |
| @@ -2,10 +2,6 @@ |
| #ifndef __ASM_SH_SPINLOCK_TYPES_H |
| #define __ASM_SH_SPINLOCK_TYPES_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| typedef struct { |
| volatile unsigned int lock; |
| } arch_spinlock_t; |
| --- a/arch/xtensa/include/asm/spinlock_types.h |
| +++ b/arch/xtensa/include/asm/spinlock_types.h |
| @@ -2,10 +2,6 @@ |
| #ifndef __ASM_SPINLOCK_TYPES_H |
| #define __ASM_SPINLOCK_TYPES_H |
| |
| -#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__ASM_SPINLOCK_H) |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| #include <asm-generic/qspinlock_types.h> |
| #include <asm-generic/qrwlock_types.h> |
| |
| --- a/include/linux/spinlock_types_up.h |
| +++ b/include/linux/spinlock_types_up.h |
| @@ -1,10 +1,6 @@ |
| #ifndef __LINUX_SPINLOCK_TYPES_UP_H |
| #define __LINUX_SPINLOCK_TYPES_UP_H |
| |
| -#ifndef __LINUX_SPINLOCK_TYPES_H |
| -# error "please don't include this file directly" |
| -#endif |
| - |
| /* |
| * include/linux/spinlock_types_up.h - spinlock type definitions for UP |
| * |