[PATCH] powerpc: merge include/asm-ppc*/spinlock_types.h into include/asm-powerpc/spinlock_types.h[PATCH]
From: Kumar Gala <hidden>
Date: 2005-09-20 21:33:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Kumar Gala <redacted> --- commit cb3e61d8491f6395a007687d9908bdb20fc9a0b5 tree da0514335c8f2ed2a795d4bbc7db06cfa6f728d5 parent 40ec2534f42b5d38123c41858a3c85bc2eae272b author Kumar K. Gala [off-list ref] Tue, 20 Sep 2005 16:27:51 -0500 committer Kumar K. Gala [off-list ref] Tue, 20 Sep 2005 16:27:51 -0500 include/asm-powerpc/spinlock_types.h | 20 ++++++++++++++++++++ include/asm-ppc/spinlock_types.h | 20 -------------------- include/asm-ppc64/spinlock_types.h | 20 -------------------- 3 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/include/asm-powerpc/spinlock_types.h b/include/asm-powerpc/spinlock_types.h
new file mode 100644
--- /dev/null
+++ b/include/asm-powerpc/spinlock_types.h@@ -0,0 +1,20 @@ +#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; +} raw_spinlock_t; + +#define __RAW_SPIN_LOCK_UNLOCKED { 0 } + +typedef struct { + volatile signed int lock; +} raw_rwlock_t; + +#define __RAW_RW_LOCK_UNLOCKED { 0 } + +#endif
diff --git a/include/asm-ppc/spinlock_types.h b/include/asm-ppc/spinlock_types.h
deleted file mode 100644
--- a/include/asm-ppc/spinlock_types.h
+++ /dev/null@@ -1,20 +0,0 @@ -#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 long lock; -} raw_spinlock_t; - -#define __RAW_SPIN_LOCK_UNLOCKED { 0 } - -typedef struct { - volatile signed int lock; -} raw_rwlock_t; - -#define __RAW_RW_LOCK_UNLOCKED { 0 } - -#endif
diff --git a/include/asm-ppc64/spinlock_types.h b/include/asm-ppc64/spinlock_types.h
deleted file mode 100644
--- a/include/asm-ppc64/spinlock_types.h
+++ /dev/null@@ -1,20 +0,0 @@ -#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; -} raw_spinlock_t; - -#define __RAW_SPIN_LOCK_UNLOCKED { 0 } - -typedef struct { - volatile signed int lock; -} raw_rwlock_t; - -#define __RAW_RW_LOCK_UNLOCKED { 0 } - -#endif