- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / include / linux / spinlock_api_up.h

diff --git a/include/linux/spinlock_api_up.h b/include/linux/spinlock_api_up.h
index 04e1d31..af1f472 100644 (file)
--- a/include/linux/spinlock_api_up.h
+++ b/include/linux/spinlock_api_up.h
@@ -16,7 +16,7 @@
 
 #define in_lock_functions(ADDR)                0
 
-#define assert_spin_locked(lock)       do { (void)(lock); } while (0)
+#define assert_raw_spin_locked(lock)   do { (void)(lock); } while (0)
 
 /*
  * In the UP-nondebug case there's no real locking going on, so the
@@ -40,7 +40,8 @@
   do { preempt_enable(); __release(lock); (void)(lock); } while (0)
 
 #define __UNLOCK_BH(lock) \
-  do { preempt_enable_no_resched(); local_bh_enable(); __release(lock); (void)(lock); } while (0)
+  do { preempt_enable_no_resched(); local_bh_enable(); \
+         __release(lock); (void)(lock); } while (0)
 
 #define __UNLOCK_IRQ(lock) \
   do { local_irq_enable(); __UNLOCK(lock); } while (0)
@@ -48,34 +49,37 @@
 #define __UNLOCK_IRQRESTORE(lock, flags) \
   do { local_irq_restore(flags); __UNLOCK(lock); } while (0)
 
-#define _spin_lock(lock)                       __LOCK(lock)
-#define _spin_lock_nested(lock, subclass)      __LOCK(lock)
-#define _read_lock(lock)                       __LOCK(lock)
-#define _write_lock(lock)                      __LOCK(lock)
-#define _spin_lock_bh(lock)                    __LOCK_BH(lock)
-#define _read_lock_bh(lock)                    __LOCK_BH(lock)
-#define _write_lock_bh(lock)                   __LOCK_BH(lock)
-#define _spin_lock_irq(lock)                   __LOCK_IRQ(lock)
-#define _read_lock_irq(lock)                   __LOCK_IRQ(lock)
-#define _write_lock_irq(lock)                  __LOCK_IRQ(lock)
-#define _spin_lock_irqsave(lock, flags)                __LOCK_IRQSAVE(lock, flags)
-#define _read_lock_irqsave(lock, flags)                __LOCK_IRQSAVE(lock, flags)
-#define _write_lock_irqsave(lock, flags)       __LOCK_IRQSAVE(lock, flags)
-#define _spin_trylock(lock)                    ({ __LOCK(lock); 1; })
-#define _read_trylock(lock)                    ({ __LOCK(lock); 1; })
-#define _write_trylock(lock)                   ({ __LOCK(lock); 1; })
-#define _spin_trylock_bh(lock)                 ({ __LOCK_BH(lock); 1; })
-#define _spin_unlock(lock)                     __UNLOCK(lock)
-#define _read_unlock(lock)                     __UNLOCK(lock)
-#define _write_unlock(lock)                    __UNLOCK(lock)
-#define _spin_unlock_bh(lock)                  __UNLOCK_BH(lock)
-#define _write_unlock_bh(lock)                 __UNLOCK_BH(lock)
-#define _read_unlock_bh(lock)                  __UNLOCK_BH(lock)
-#define _spin_unlock_irq(lock)                 __UNLOCK_IRQ(lock)
-#define _read_unlock_irq(lock)                 __UNLOCK_IRQ(lock)
-#define _write_unlock_irq(lock)                        __UNLOCK_IRQ(lock)
-#define _spin_unlock_irqrestore(lock, flags)   __UNLOCK_IRQRESTORE(lock, flags)
-#define _read_unlock_irqrestore(lock, flags)   __UNLOCK_IRQRESTORE(lock, flags)
-#define _write_unlock_irqrestore(lock, flags)  __UNLOCK_IRQRESTORE(lock, flags)
+#define _raw_spin_lock(lock)                   __LOCK(lock)
+#define _raw_spin_lock_nested(lock, subclass)  __LOCK(lock)
+#define _raw_read_lock(lock)                   __LOCK(lock)
+#define _raw_write_lock(lock)                  __LOCK(lock)
+#define _raw_spin_lock_bh(lock)                        __LOCK_BH(lock)
+#define _raw_read_lock_bh(lock)                        __LOCK_BH(lock)
+#define _raw_write_lock_bh(lock)               __LOCK_BH(lock)
+#define _raw_spin_lock_irq(lock)               __LOCK_IRQ(lock)
+#define _raw_read_lock_irq(lock)               __LOCK_IRQ(lock)
+#define _raw_write_lock_irq(lock)              __LOCK_IRQ(lock)
+#define _raw_spin_lock_irqsave(lock, flags)    __LOCK_IRQSAVE(lock, flags)
+#define _raw_read_lock_irqsave(lock, flags)    __LOCK_IRQSAVE(lock, flags)
+#define _raw_write_lock_irqsave(lock, flags)   __LOCK_IRQSAVE(lock, flags)
+#define _raw_spin_trylock(lock)                        ({ __LOCK(lock); 1; })
+#define _raw_read_trylock(lock)                        ({ __LOCK(lock); 1; })
+#define _raw_write_trylock(lock)                       ({ __LOCK(lock); 1; })
+#define _raw_spin_trylock_bh(lock)             ({ __LOCK_BH(lock); 1; })
+#define _raw_spin_unlock(lock)                 __UNLOCK(lock)
+#define _raw_read_unlock(lock)                 __UNLOCK(lock)
+#define _raw_write_unlock(lock)                        __UNLOCK(lock)
+#define _raw_spin_unlock_bh(lock)              __UNLOCK_BH(lock)
+#define _raw_write_unlock_bh(lock)             __UNLOCK_BH(lock)
+#define _raw_read_unlock_bh(lock)              __UNLOCK_BH(lock)
+#define _raw_spin_unlock_irq(lock)             __UNLOCK_IRQ(lock)
+#define _raw_read_unlock_irq(lock)             __UNLOCK_IRQ(lock)
+#define _raw_write_unlock_irq(lock)            __UNLOCK_IRQ(lock)
+#define _raw_spin_unlock_irqrestore(lock, flags) \
+                                       __UNLOCK_IRQRESTORE(lock, flags)
+#define _raw_read_unlock_irqrestore(lock, flags) \
+                                       __UNLOCK_IRQRESTORE(lock, flags)
+#define _raw_write_unlock_irqrestore(lock, flags) \
+                                       __UNLOCK_IRQRESTORE(lock, flags)
 
 #endif /* __LINUX_SPINLOCK_API_UP_H */