Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] powerpc: Fix building of power3 config on ppc32

Browse source 
The spinlock_types.h merge renamed the structure for raw_spinlock_t to
match ppc64.  In doing so some of the spinlock macros/functions needed to
be updated to match.  Apparently, this seems to only be caught when
building power3.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Kumar Gala 2005-09-22 10:13:31 -05:00 committed by Paul Mackerras
parent b671ad2bef
commit 3efc333e7f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/asm-ppc/spinlock.h
View file

@ -9,7 +9,7 @@
* (the type definitions are in asm/raw_spinlock_types.h) * (the type definitions are in asm/raw_spinlock_types.h)
*/ */
#define __raw_spin_is_locked(x) ((x)->lock != 0) #define __raw_spin_is_locked(x) ((x)->slock != 0)
#define __raw_spin_unlock_wait(lock) \ #define __raw_spin_unlock_wait(lock) \
do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0) do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock) #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
@ -31,17 +31,17 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
bne- 2b\n\ bne- 2b\n\
isync" isync"
: "=&r"(tmp) : "=&r"(tmp)
: "r"(&lock->lock), "r"(1) : "r"(&lock->slock), "r"(1)
: "cr0", "memory"); : "cr0", "memory");
} }
static inline void __raw_spin_unlock(raw_spinlock_t *lock) static inline void __raw_spin_unlock(raw_spinlock_t *lock)
{ {
__asm__ __volatile__("eieio # __raw_spin_unlock": : :"memory"); __asm__ __volatile__("eieio # __raw_spin_unlock": : :"memory");
lock->lock = 0; lock->slock = 0;
} }
#define __raw_spin_trylock(l) (!test_and_set_bit(0,&(l)->lock)) #define __raw_spin_trylock(l) (!test_and_set_bit(0,(volatile unsigned long *)(&(l)->slock)))
/* /*
* Read-write spinlocks, allowing multiple readers * Read-write spinlocks, allowing multiple readers