aboutsummaryrefslogtreecommitdiff
path: root/include/asm-sparc64/spinlock_types.h
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-06-19 22:39:00 +0200
committerDavid S. Miller <davem@davemloft.net>2008-07-17 21:45:02 -0700
commit5e3609f60c09f0f15f71f80c6d7933b2c7be71a6 (patch)
treecae8f8c2f446b7e979b1763d78af19a025ab756f /include/asm-sparc64/spinlock_types.h
parent075ae525327ed789f5b755a8042ee6f3a0e2ab7b (diff)
sparc: merge header files with trivial differences
A manual inspection revealed that the following headerfiles contained only trivial differences: hw_irq.h idprom.h kmap_types.h kvm.h spinlock_types.h sunbpp.h unaligned.h The only noteworthy change are that sparc64 had a volatile qualifer that sparc missed in spinlock_types.h. In addition a few comments were updated. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc64/spinlock_types.h')
-rw-r--r--include/asm-sparc64/spinlock_types.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/include/asm-sparc64/spinlock_types.h b/include/asm-sparc64/spinlock_types.h
index e128112a0d7..48d81c8734b 100644
--- a/include/asm-sparc64/spinlock_types.h
+++ b/include/asm-sparc64/spinlock_types.h
@@ -1,20 +1 @@
-#ifndef __SPARC64_SPINLOCK_TYPES_H
-#define __SPARC64_SPINLOCK_TYPES_H
-
-#ifndef __LINUX_SPINLOCK_TYPES_H
-# error "please don't include this file directly"
-#endif
-
-typedef struct {
- volatile unsigned char lock;
-} raw_spinlock_t;
-
-#define __RAW_SPIN_LOCK_UNLOCKED { 0 }
-
-typedef struct {
- volatile unsigned int lock;
-} raw_rwlock_t;
-
-#define __RAW_RW_LOCK_UNLOCKED { 0 }
-
-#endif
+#include <asm-sparc/spinlock_types.h>