small fixes

insert barrier() to be sure order is preserved by inline expansion
don't depend on macro for initialization

1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/queuelock.h b/include/linux/queuelock.h
index d60800d90e..6dac31c358 100644
--- a/include/linux/queuelock.h
+++ b/include/linux/queuelock.h
@@ -15,10 +15,8 @@
 *     not enforced, but it will not work.
 */
 
-#include <linux/spinlock.h>
 #include <linux/cache.h>
 #include <asm/atomic.h>
-#include <linux/cpumask.h>
 #include <linux/smp.h>
 
 typedef struct {
@@ -48,7 +46,7 @@ typedef struct {
 static inline void queue_lock_init(queuelock_t *lock)
 {
         int i;
-        for_each_possible_cpu(i) {
+        for (i = 0; i < NR_CPUS; i++) {
                 lock->slots[i].val      = MUST_WAIT;
                 lock->spin_slot[i]      = i;
         }
@@ -76,12 +74,14 @@ static inline void queue_lock(queuelock_t *lock)
         while (lock->slots[lock->spin_slot[me]].val == MUST_WAIT);
         /* reset the lock */
         lock->slots[lock->spin_slot[me]].val = MUST_WAIT;
+        barrier();
 }
 
 
 static inline void queue_unlock(queuelock_t *lock)
 {
         int me = smp_processor_id();
+        barrier();
         lock->slots[(lock->spin_slot[me] + 1) % NR_CPUS].val = HAS_LOCK;
 }