projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[cascardo/linux.git]
/
arch
/
sparc
/
include
/
asm
/
spinlock_64.h
diff --git
a/arch/sparc/include/asm/spinlock_64.h
b/arch/sparc/include/asm/spinlock_64.h
index
87990b7
..
07c9f2e
100644
(file)
--- a/
arch/sparc/include/asm/spinlock_64.h
+++ b/
arch/sparc/include/asm/spinlock_64.h
@@
-96,7
+96,7
@@
static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
/* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
/* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
-static
void inline
arch_read_lock(arch_rwlock_t *lock)
+static
inline void
arch_read_lock(arch_rwlock_t *lock)
{
unsigned long tmp1, tmp2;
{
unsigned long tmp1, tmp2;
@@
-119,7
+119,7
@@
static void inline arch_read_lock(arch_rwlock_t *lock)
: "memory");
}
: "memory");
}
-static in
t inline
arch_read_trylock(arch_rwlock_t *lock)
+static in
line int
arch_read_trylock(arch_rwlock_t *lock)
{
int tmp1, tmp2;
{
int tmp1, tmp2;
@@
-140,7
+140,7
@@
static int inline arch_read_trylock(arch_rwlock_t *lock)
return tmp1;
}
return tmp1;
}
-static
void inline
arch_read_unlock(arch_rwlock_t *lock)
+static
inline void
arch_read_unlock(arch_rwlock_t *lock)
{
unsigned long tmp1, tmp2;
{
unsigned long tmp1, tmp2;
@@
-156,7
+156,7
@@
static void inline arch_read_unlock(arch_rwlock_t *lock)
: "memory");
}
: "memory");
}
-static
void inline
arch_write_lock(arch_rwlock_t *lock)
+static
inline void
arch_write_lock(arch_rwlock_t *lock)
{
unsigned long mask, tmp1, tmp2;
{
unsigned long mask, tmp1, tmp2;
@@
-181,7
+181,7
@@
static void inline arch_write_lock(arch_rwlock_t *lock)
: "memory");
}
: "memory");
}
-static
void inline
arch_write_unlock(arch_rwlock_t *lock)
+static
inline void
arch_write_unlock(arch_rwlock_t *lock)
{
__asm__ __volatile__(
" stw %%g0, [%0]"
{
__asm__ __volatile__(
" stw %%g0, [%0]"
@@
-190,7
+190,7
@@
static void inline arch_write_unlock(arch_rwlock_t *lock)
: "memory");
}
: "memory");
}
-static in
t inline
arch_write_trylock(arch_rwlock_t *lock)
+static in
line int
arch_write_trylock(arch_rwlock_t *lock)
{
unsigned long mask, tmp1, tmp2, result;
{
unsigned long mask, tmp1, tmp2, result;