diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2021-08-15 23:28:34 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2021-08-17 18:24:31 +0200 |
| commit | 4f1893ec8cfb4b17e3b89158a1e3e550a9a9bf3c (patch) | |
| tree | 95d9b147d18a65717dadd320c347ced15b8cdac6 | |
| parent | locking/mutex: Move the 'struct mutex_waiter' definition from <linux/mutex.h> to the internal header (diff) | |
| download | wireguard-linux-4f1893ec8cfb4b17e3b89158a1e3e550a9a9bf3c.tar.xz wireguard-linux-4f1893ec8cfb4b17e3b89158a1e3e550a9a9bf3c.zip | |
locking/ww_mutex: Move the ww_mutex definitions from <linux/mutex.h> into <linux/ww_mutex.h>
Move the ww_mutex definitions into the ww_mutex specific header where they
belong.
Preparatory change to allow compiling ww_mutexes standalone.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210815211304.110216293@linutronix.de
| -rw-r--r-- | include/linux/mutex.h | 11 | ||||
| -rw-r--r-- | include/linux/ww_mutex.h | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 62bafee747e9..db3367586a06 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -20,9 +20,6 @@ #include <linux/osq_lock.h> #include <linux/debug_locks.h> -struct ww_class; -struct ww_acquire_ctx; - /* * Simple, straightforward mutexes with strict semantics: * @@ -66,14 +63,6 @@ struct mutex { #endif }; -struct ww_mutex { - struct mutex base; - struct ww_acquire_ctx *ctx; -#ifdef CONFIG_DEBUG_MUTEXES - struct ww_class *ww_class; -#endif -}; - #ifdef CONFIG_DEBUG_MUTEXES #define __DEBUG_MUTEX_INITIALIZER(lockname) \ diff --git a/include/linux/ww_mutex.h b/include/linux/ww_mutex.h index b77f39f319ad..590aaa207757 100644 --- a/include/linux/ww_mutex.h +++ b/include/linux/ww_mutex.h @@ -28,6 +28,14 @@ struct ww_class { unsigned int is_wait_die; }; +struct ww_mutex { + struct mutex base; + struct ww_acquire_ctx *ctx; +#ifdef CONFIG_DEBUG_MUTEXES + struct ww_class *ww_class; +#endif +}; + struct ww_acquire_ctx { struct task_struct *task; unsigned long stamp; |