diff options
Diffstat (limited to 'include/linux/six.h')
| -rw-r--r-- | include/linux/six.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/six.h b/include/linux/six.h index 4d1853617ea7..f336ae049df8 100644 --- a/include/linux/six.h +++ b/include/linux/six.h @@ -59,7 +59,6 @@ */ #include <linux/lockdep.h> -#include <linux/osq_lock.h> #include <linux/sched.h> #include <linux/types.h> @@ -105,10 +104,9 @@ enum six_lock_type { struct six_lock { union six_lock_state state; - unsigned intent_lock_recurse; struct task_struct *owner; unsigned __percpu *readers; - struct optimistic_spin_queue osq; + unsigned intent_lock_recurse; raw_spinlock_t wait_lock; struct list_head wait_list; #ifdef CONFIG_DEBUG_LOCK_ALLOC |