186 lines
6.3 KiB
Diff
186 lines
6.3 KiB
Diff
From bc75231f5bf2a3820fcab8fdc7b9686f8352d04e Mon Sep 17 00:00:00 2001
|
|
Message-Id: <bc75231f5bf2a3820fcab8fdc7b9686f8352d04e.1601675152.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Fri, 4 Aug 2017 17:40:42 +0200
|
|
Subject: [PATCH 156/333] locking: don't check for __LINUX_SPINLOCK_TYPES_H on
|
|
-RT archs
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
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(-)
|
|
|
|
diff --git a/arch/alpha/include/asm/spinlock_types.h b/arch/alpha/include/asm/spinlock_types.h
|
|
index 1d5716bc060b..6883bc952d22 100644
|
|
--- 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;
|
|
diff --git a/arch/arm/include/asm/spinlock_types.h b/arch/arm/include/asm/spinlock_types.h
|
|
index 5976958647fe..a37c0803954b 100644
|
|
--- 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 {
|
|
diff --git a/arch/arm64/include/asm/spinlock_types.h b/arch/arm64/include/asm/spinlock_types.h
|
|
index a157ff465e27..f952fdda8346 100644
|
|
--- a/arch/arm64/include/asm/spinlock_types.h
|
|
+++ b/arch/arm64/include/asm/spinlock_types.h
|
|
@@ -16,10 +16,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>
|
|
|
|
diff --git a/arch/hexagon/include/asm/spinlock_types.h b/arch/hexagon/include/asm/spinlock_types.h
|
|
index 7a906b5214a4..d8f596fec022 100644
|
|
--- a/arch/hexagon/include/asm/spinlock_types.h
|
|
+++ b/arch/hexagon/include/asm/spinlock_types.h
|
|
@@ -21,10 +21,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;
|
|
diff --git a/arch/ia64/include/asm/spinlock_types.h b/arch/ia64/include/asm/spinlock_types.h
|
|
index 6e345fefcdca..681408d6816f 100644
|
|
--- 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;
|
|
diff --git a/arch/powerpc/include/asm/spinlock_types.h b/arch/powerpc/include/asm/spinlock_types.h
|
|
index 87adaf13b7e8..7305cb6a53e4 100644
|
|
--- 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;
|
|
diff --git a/arch/s390/include/asm/spinlock_types.h b/arch/s390/include/asm/spinlock_types.h
|
|
index cfed272e4fd5..8e28e8176ec8 100644
|
|
--- 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;
|
|
diff --git a/arch/sh/include/asm/spinlock_types.h b/arch/sh/include/asm/spinlock_types.h
|
|
index e82369f286a2..22ca9a98bbb8 100644
|
|
--- 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;
|
|
diff --git a/arch/xtensa/include/asm/spinlock_types.h b/arch/xtensa/include/asm/spinlock_types.h
|
|
index bb1fe6c1816e..8a22f1e7b6c9 100644
|
|
--- 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
|
|
|
|
-#ifndef __LINUX_SPINLOCK_TYPES_H
|
|
-# error "please don't include this file directly"
|
|
-#endif
|
|
-
|
|
typedef struct {
|
|
volatile unsigned int slock;
|
|
} arch_spinlock_t;
|
|
diff --git a/include/linux/spinlock_types_up.h b/include/linux/spinlock_types_up.h
|
|
index c09b6407ae1b..b0243ba07fb7 100644
|
|
--- 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
|
|
*
|
|
--
|
|
2.17.1
|
|
|