projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PARISC] fix section mismatches in arch/parisc/kernel
[powerpc.git]
/
include
/
asm-parisc
/
spinlock_types.h
diff --git
a/include/asm-parisc/spinlock_types.h
b/include/asm-parisc/spinlock_types.h
index
785bba8
..
3f72f47
100644
(file)
--- a/
include/asm-parisc/spinlock_types.h
+++ b/
include/asm-parisc/spinlock_types.h
@@
-1,16
+1,16
@@
#ifndef __ASM_SPINLOCK_TYPES_H
#define __ASM_SPINLOCK_TYPES_H
#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 {
typedef struct {
+#ifdef CONFIG_PA20
+ volatile unsigned int slock;
+# define __RAW_SPIN_LOCK_UNLOCKED { 1 }
+#else
volatile unsigned int lock[4];
volatile unsigned int lock[4];
+# define __RAW_SPIN_LOCK_UNLOCKED { { 1, 1, 1, 1 } }
+#endif
} raw_spinlock_t;
} raw_spinlock_t;
-#define __RAW_SPIN_LOCK_UNLOCKED { { 1, 1, 1, 1 } }
-
typedef struct {
raw_spinlock_t lock;
volatile int counter;
typedef struct {
raw_spinlock_t lock;
volatile int counter;