| Subject: spinlock: Split the lock types header |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Wed, 29 Jun 2011 19:34:01 +0200 |
| |
| Split raw_spinlock into its own file and the remaining spinlock_t into |
| its own non-RT header. The non-RT header will be replaced later by sleeping |
| spinlocks. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| include/linux/rwlock_types.h | 4 + |
| include/linux/spinlock_types.h | 74 ------------------------------------ |
| include/linux/spinlock_types_nort.h | 33 ++++++++++++++++ |
| include/linux/spinlock_types_raw.h | 56 +++++++++++++++++++++++++++ |
| 4 files changed, 95 insertions(+), 72 deletions(-) |
| |
| --- a/include/linux/rwlock_types.h |
| +++ b/include/linux/rwlock_types.h |
| @@ -1,6 +1,10 @@ |
| #ifndef __LINUX_RWLOCK_TYPES_H |
| #define __LINUX_RWLOCK_TYPES_H |
| |
| +#if !defined(__LINUX_SPINLOCK_TYPES_H) |
| +# error "Do not include directly, include spinlock_types.h" |
| +#endif |
| + |
| /* |
| * include/linux/rwlock_types.h - generic rwlock type definitions |
| * and initializers |
| --- a/include/linux/spinlock_types.h |
| +++ b/include/linux/spinlock_types.h |
| @@ -9,79 +9,9 @@ |
| * Released under the General Public License (GPL). |
| */ |
| |
| -#if defined(CONFIG_SMP) |
| -# include <asm/spinlock_types.h> |
| -#else |
| -# include <linux/spinlock_types_up.h> |
| -#endif |
| +#include <linux/spinlock_types_raw.h> |
| |
| -#include <linux/lockdep.h> |
| - |
| -typedef struct raw_spinlock { |
| - arch_spinlock_t raw_lock; |
| -#ifdef CONFIG_GENERIC_LOCKBREAK |
| - unsigned int break_lock; |
| -#endif |
| -#ifdef CONFIG_DEBUG_SPINLOCK |
| - unsigned int magic, owner_cpu; |
| - void *owner; |
| -#endif |
| -#ifdef CONFIG_DEBUG_LOCK_ALLOC |
| - struct lockdep_map dep_map; |
| -#endif |
| -} raw_spinlock_t; |
| - |
| -#define SPINLOCK_MAGIC 0xdead4ead |
| - |
| -#define SPINLOCK_OWNER_INIT ((void *)-1L) |
| - |
| -#ifdef CONFIG_DEBUG_LOCK_ALLOC |
| -# define SPIN_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname } |
| -#else |
| -# define SPIN_DEP_MAP_INIT(lockname) |
| -#endif |
| - |
| -#ifdef CONFIG_DEBUG_SPINLOCK |
| -# define SPIN_DEBUG_INIT(lockname) \ |
| - .magic = SPINLOCK_MAGIC, \ |
| - .owner_cpu = -1, \ |
| - .owner = SPINLOCK_OWNER_INIT, |
| -#else |
| -# define SPIN_DEBUG_INIT(lockname) |
| -#endif |
| - |
| -#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \ |
| - { \ |
| - .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \ |
| - SPIN_DEBUG_INIT(lockname) \ |
| - SPIN_DEP_MAP_INIT(lockname) } |
| - |
| -#define __RAW_SPIN_LOCK_UNLOCKED(lockname) \ |
| - (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname) |
| - |
| -#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x) |
| - |
| -typedef struct spinlock { |
| - union { |
| - struct raw_spinlock rlock; |
| - |
| -#ifdef CONFIG_DEBUG_LOCK_ALLOC |
| -# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map)) |
| - struct { |
| - u8 __padding[LOCK_PADSIZE]; |
| - struct lockdep_map dep_map; |
| - }; |
| -#endif |
| - }; |
| -} spinlock_t; |
| - |
| -#define __SPIN_LOCK_INITIALIZER(lockname) \ |
| - { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } } |
| - |
| -#define __SPIN_LOCK_UNLOCKED(lockname) \ |
| - (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname) |
| - |
| -#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) |
| +#include <linux/spinlock_types_nort.h> |
| |
| #include <linux/rwlock_types.h> |
| |
| --- /dev/null |
| +++ b/include/linux/spinlock_types_nort.h |
| @@ -0,0 +1,33 @@ |
| +#ifndef __LINUX_SPINLOCK_TYPES_NORT_H |
| +#define __LINUX_SPINLOCK_TYPES_NORT_H |
| + |
| +#ifndef __LINUX_SPINLOCK_TYPES_H |
| +#error "Do not include directly. Include spinlock_types.h instead" |
| +#endif |
| + |
| +/* |
| + * The non RT version maps spinlocks to raw_spinlocks |
| + */ |
| +typedef struct spinlock { |
| + union { |
| + struct raw_spinlock rlock; |
| + |
| +#ifdef CONFIG_DEBUG_LOCK_ALLOC |
| +# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map)) |
| + struct { |
| + u8 __padding[LOCK_PADSIZE]; |
| + struct lockdep_map dep_map; |
| + }; |
| +#endif |
| + }; |
| +} spinlock_t; |
| + |
| +#define __SPIN_LOCK_INITIALIZER(lockname) \ |
| + { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } } |
| + |
| +#define __SPIN_LOCK_UNLOCKED(lockname) \ |
| + (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname) |
| + |
| +#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) |
| + |
| +#endif |
| --- /dev/null |
| +++ b/include/linux/spinlock_types_raw.h |
| @@ -0,0 +1,56 @@ |
| +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H |
| +#define __LINUX_SPINLOCK_TYPES_RAW_H |
| + |
| +#if defined(CONFIG_SMP) |
| +# include <asm/spinlock_types.h> |
| +#else |
| +# include <linux/spinlock_types_up.h> |
| +#endif |
| + |
| +#include <linux/lockdep.h> |
| + |
| +typedef struct raw_spinlock { |
| + arch_spinlock_t raw_lock; |
| +#ifdef CONFIG_GENERIC_LOCKBREAK |
| + unsigned int break_lock; |
| +#endif |
| +#ifdef CONFIG_DEBUG_SPINLOCK |
| + unsigned int magic, owner_cpu; |
| + void *owner; |
| +#endif |
| +#ifdef CONFIG_DEBUG_LOCK_ALLOC |
| + struct lockdep_map dep_map; |
| +#endif |
| +} raw_spinlock_t; |
| + |
| +#define SPINLOCK_MAGIC 0xdead4ead |
| + |
| +#define SPINLOCK_OWNER_INIT ((void *)-1L) |
| + |
| +#ifdef CONFIG_DEBUG_LOCK_ALLOC |
| +# define SPIN_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname } |
| +#else |
| +# define SPIN_DEP_MAP_INIT(lockname) |
| +#endif |
| + |
| +#ifdef CONFIG_DEBUG_SPINLOCK |
| +# define SPIN_DEBUG_INIT(lockname) \ |
| + .magic = SPINLOCK_MAGIC, \ |
| + .owner_cpu = -1, \ |
| + .owner = SPINLOCK_OWNER_INIT, |
| +#else |
| +# define SPIN_DEBUG_INIT(lockname) |
| +#endif |
| + |
| +#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \ |
| + { \ |
| + .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \ |
| + SPIN_DEBUG_INIT(lockname) \ |
| + SPIN_DEP_MAP_INIT(lockname) } |
| + |
| +#define __RAW_SPIN_LOCK_UNLOCKED(lockname) \ |
| + (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname) |
| + |
| +#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x) |
| + |
| +#endif |