git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
parisc
/
lib
/
bitops.c
diff --git
a/arch/parisc/lib/bitops.c
b/arch/parisc/lib/bitops.c
index
b7e171a
..
4c077fc
100644
(file)
--- a/
arch/parisc/lib/bitops.c
+++ b/
arch/parisc/lib/bitops.c
@@
-34,26
+34,26
@@
unsigned long __xchg64(unsigned long x, unsigned long *ptr)
unsigned long __xchg32(int x, int *ptr)
{
unsigned long flags;
unsigned long __xchg32(int x, int *ptr)
{
unsigned long flags;
-
unsigned
long temp;
+ long temp;
atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
-
(long) temp = (long) *ptr;
/* XXX - sign extension wanted? */
+
temp = (long) *ptr;
/* XXX - sign extension wanted? */
*ptr = x;
atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
*ptr = x;
atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
- return temp;
+ return
(unsigned long)
temp;
}
unsigned long __xchg8(char x, char *ptr)
{
unsigned long flags;
}
unsigned long __xchg8(char x, char *ptr)
{
unsigned long flags;
-
unsigned
long temp;
+ long temp;
atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
atomic_spin_lock_irqsave(ATOMIC_HASH(ptr), flags);
-
(long) temp = (long) *ptr;
/* XXX - sign extension wanted? */
+
temp = (long) *ptr;
/* XXX - sign extension wanted? */
*ptr = x;
atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
*ptr = x;
atomic_spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);
- return temp;
+ return
(unsigned long)
temp;
}
}