aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 16:32:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-31 16:32:30 -0400
commitadb3b1f3fc1c6edb501808ebf80a81e81c52eb73 (patch)
tree9490e03ee23abda6a42cc0070aec5494c18ce9bf /arch/parisc/include/asm
parenta75ee6ecd411a50bf4da927c2fdb2cb56246a2bd (diff)
parent7ec6118c46699548b302149bba791166004c8428 (diff)
Merge tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
Pull PARISC misc updates from James Bottomley: "This is a couple of minor updates (fixing lws futex locking and removing some obsolete cpu_*_map calls)." * tag 'parisc-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] remove references to cpu_*_map. [PARISC] futex: Use same lock set as lws calls
Diffstat (limited to 'arch/parisc/include/asm')
-rw-r--r--arch/parisc/include/asm/futex.h31
1 files changed, 27 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/futex.h b/arch/parisc/include/asm/futex.h
index 2388bdb32832..49df14805a9b 100644
--- a/arch/parisc/include/asm/futex.h
+++ b/arch/parisc/include/asm/futex.h
@@ -8,6 +8,29 @@
8#include <asm/atomic.h> 8#include <asm/atomic.h>
9#include <asm/errno.h> 9#include <asm/errno.h>
10 10
11/* The following has to match the LWS code in syscall.S. We have
12 sixteen four-word locks. */
13
14static inline void
15_futex_spin_lock_irqsave(u32 __user *uaddr, unsigned long int *flags)
16{
17 extern u32 lws_lock_start[];
18 long index = ((long)uaddr & 0xf0) >> 2;
19 arch_spinlock_t *s = (arch_spinlock_t *)&lws_lock_start[index];
20 local_irq_save(*flags);
21 arch_spin_lock(s);
22}
23
24static inline void
25_futex_spin_unlock_irqrestore(u32 __user *uaddr, unsigned long int *flags)
26{
27 extern u32 lws_lock_start[];
28 long index = ((long)uaddr & 0xf0) >> 2;
29 arch_spinlock_t *s = (arch_spinlock_t *)&lws_lock_start[index];
30 arch_spin_unlock(s);
31 local_irq_restore(*flags);
32}
33
11static inline int 34static inline int
12futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 35futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
13{ 36{
@@ -26,7 +49,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
26 49
27 pagefault_disable(); 50 pagefault_disable();
28 51
29 _atomic_spin_lock_irqsave(uaddr, flags); 52 _futex_spin_lock_irqsave(uaddr, &flags);
30 53
31 switch (op) { 54 switch (op) {
32 case FUTEX_OP_SET: 55 case FUTEX_OP_SET:
@@ -71,7 +94,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
71 ret = -ENOSYS; 94 ret = -ENOSYS;
72 } 95 }
73 96
74 _atomic_spin_unlock_irqrestore(uaddr, flags); 97 _futex_spin_unlock_irqrestore(uaddr, &flags);
75 98
76 pagefault_enable(); 99 pagefault_enable();
77 100
@@ -113,7 +136,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
113 * address. This should scale to a couple of CPUs. 136 * address. This should scale to a couple of CPUs.
114 */ 137 */
115 138
116 _atomic_spin_lock_irqsave(uaddr, flags); 139 _futex_spin_lock_irqsave(uaddr, &flags);
117 140
118 ret = get_user(val, uaddr); 141 ret = get_user(val, uaddr);
119 142
@@ -122,7 +145,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
122 145
123 *uval = val; 146 *uval = val;
124 147
125 _atomic_spin_unlock_irqrestore(uaddr, flags); 148 _futex_spin_unlock_irqrestore(uaddr, &flags);
126 149
127 return ret; 150 return ret;
128} 151}