These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / lglock.h

diff --git a/kernel/include/linux/lglock.h b/kernel/include/linux/lglock.h
index 9603a15..6f035f6 100644 (file)
--- a/kernel/include/linux/lglock.h
+++ b/kernel/include/linux/lglock.h
@@ -34,10 +34,10 @@
 #endif
 
 struct lglock {
-#ifndef CONFIG_PREEMPT_RT_FULL
-       arch_spinlock_t __percpu *lock;
-#else
+#ifdef CONFIG_PREEMPT_RT_FULL
        struct rt_mutex __percpu *lock;
+#else
+       arch_spinlock_t __percpu *lock;
 #endif
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
        struct lock_class_key lock_key;
@@ -45,34 +45,40 @@ struct lglock {
 #endif
 };
 
-#ifndef CONFIG_PREEMPT_RT_FULL
+#ifdef CONFIG_PREEMPT_RT_FULL
 # define DEFINE_LGLOCK(name)                                           \
-       static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)           \
-       = __ARCH_SPIN_LOCK_UNLOCKED;                                    \
+       static DEFINE_PER_CPU(struct rt_mutex, name ## _lock)           \
+       = __RT_MUTEX_INITIALIZER( name ## _lock);                       \
        struct lglock name = { .lock = &name ## _lock }
 
 # define DEFINE_STATIC_LGLOCK(name)                                    \
-       static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)           \
-       = __ARCH_SPIN_LOCK_UNLOCKED;                                    \
+       static DEFINE_PER_CPU(struct rt_mutex, name ## _lock)           \
+       = __RT_MUTEX_INITIALIZER( name ## _lock);                       \
        static struct lglock name = { .lock = &name ## _lock }
+
 #else
 
-# define DEFINE_LGLOCK(name)                                           \
-       static DEFINE_PER_CPU(struct rt_mutex, name ## _lock)           \
-       = __RT_MUTEX_INITIALIZER( name ## _lock);                       \
+#define DEFINE_LGLOCK(name)                                            \
+       static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)           \
+       = __ARCH_SPIN_LOCK_UNLOCKED;                                    \
        struct lglock name = { .lock = &name ## _lock }
 
-# define DEFINE_STATIC_LGLOCK(name)                                    \
-       static DEFINE_PER_CPU(struct rt_mutex, name ## _lock)           \
-       = __RT_MUTEX_INITIALIZER( name ## _lock);                       \
+#define DEFINE_STATIC_LGLOCK(name)                                     \
+       static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)           \
+       = __ARCH_SPIN_LOCK_UNLOCKED;                                    \
        static struct lglock name = { .lock = &name ## _lock }
 #endif
 
 void lg_lock_init(struct lglock *lg, char *name);
+
 void lg_local_lock(struct lglock *lg);
 void lg_local_unlock(struct lglock *lg);
 void lg_local_lock_cpu(struct lglock *lg, int cpu);
 void lg_local_unlock_cpu(struct lglock *lg, int cpu);
+
+void lg_double_lock(struct lglock *lg, int cpu1, int cpu2);
+void lg_double_unlock(struct lglock *lg, int cpu1, int cpu2);
+
 void lg_global_lock(struct lglock *lg);
 void lg_global_unlock(struct lglock *lg);