summaryrefslogtreecommitdiff
path: root/source4/lib/tdb/common/spinlock.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-06-01 08:12:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:23 -0500
commitfa2e9ec311b99dee2fbff5ee5fa2c743298dacad (patch)
tree35dc6a43cb10399e427b2fcd76d24cc23c77151d /source4/lib/tdb/common/spinlock.c
parentb88fc7a3911e0ff8b6d7d324028e351281e94c46 (diff)
downloadsamba-fa2e9ec311b99dee2fbff5ee5fa2c743298dacad.tar.gz
samba-fa2e9ec311b99dee2fbff5ee5fa2c743298dacad.tar.bz2
samba-fa2e9ec311b99dee2fbff5ee5fa2c743298dacad.zip
r960: convert 'unsigned int' to uint_t in the most places
metze (This used to be commit 18062d2ed9fc9224c43143c10efbf2f6f1f5bbe0)
Diffstat (limited to 'source4/lib/tdb/common/spinlock.c')
-rw-r--r--source4/lib/tdb/common/spinlock.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/tdb/common/spinlock.c b/source4/lib/tdb/common/spinlock.c
index 1b789d4daa..0c8991c1e0 100644
--- a/source4/lib/tdb/common/spinlock.c
+++ b/source4/lib/tdb/common/spinlock.c
@@ -55,7 +55,7 @@
static inline int __spin_trylock(spinlock_t *lock)
{
- unsigned int result;
+ uint_t result;
asm volatile("ldstub [%1], %0"
: "=r" (result)
@@ -85,7 +85,7 @@ static inline int __spin_is_locked(spinlock_t *lock)
static inline int __spin_trylock(spinlock_t *lock)
{
- unsigned int result;
+ uint_t result;
__asm__ __volatile__(
"1: lwarx %0,0,%1\n\
@@ -167,7 +167,7 @@ static inline int __spin_is_locked(spinlock_t *lock)
/* Returns 0 if the lock is acquired, EBUSY otherwise. */
static inline int __spin_trylock(spinlock_t *lock)
{
- unsigned int val;
+ uint_t val;
val = __lock_test_and_set(lock, 1);
return val == 0 ? 0 : EBUSY;
}
@@ -185,16 +185,16 @@ static inline void __spin_lock_init(spinlock_t *lock)
/* Returns 1 if the lock is held, 0 otherwise. */
static inline int __spin_is_locked(spinlock_t *lock)
{
- unsigned int val;
+ uint_t val;
val = __add_and_fetch(lock, 0);
return val;
}
#elif defined(MIPS_SPINLOCKS)
-static inline unsigned int load_linked(unsigned long addr)
+static inline uint_t load_linked(unsigned long addr)
{
- unsigned int res;
+ uint_t res;
__asm__ __volatile__("ll\t%0,(%1)"
: "=r" (res)
@@ -203,9 +203,9 @@ static inline unsigned int load_linked(unsigned long addr)
return res;
}
-static inline unsigned int store_conditional(unsigned long addr, unsigned int value)
+static inline uint_t store_conditional(unsigned long addr, uint_t value)
{
- unsigned int res;
+ uint_t res;
__asm__ __volatile__("sc\t%0,(%2)"
: "=r" (res)
@@ -215,7 +215,7 @@ static inline unsigned int store_conditional(unsigned long addr, unsigned int va
static inline int __spin_trylock(spinlock_t *lock)
{
- unsigned int mw;
+ uint_t mw;
do {
mw = load_linked(lock);
@@ -418,7 +418,7 @@ int tdb_spinunlock(TDB_CONTEXT *tdb, int list, int rw_type)
return 0;
}
-int tdb_create_rwlocks(int fd, unsigned int hash_size)
+int tdb_create_rwlocks(int fd, uint_t hash_size)
{
unsigned size, i;
tdb_rwlock_t *rwlocks;
@@ -460,7 +460,7 @@ int tdb_clear_spinlocks(TDB_CONTEXT *tdb)
return 0;
}
#else
-int tdb_create_rwlocks(int fd, unsigned int hash_size) { return 0; }
+int tdb_create_rwlocks(int fd, uint_t hash_size) { return 0; }
int tdb_spinlock(TDB_CONTEXT *tdb, int list, int rw_type) { return -1; }
int tdb_spinunlock(TDB_CONTEXT *tdb, int list, int rw_type) { return -1; }