| Date | Tue, 13 Jul 2021 17:11:25 +0200 | From | Thomas Gleixner <> | Subject | [patch 31/50] locking/ww_mutex: Move ww_mutex declarations into ww_mutex.h |
| |
From: Thomas Gleixner <tglx@linutronix.de>
Move the ww_mutex declarations into the ww_mutex specific header where they belong.
Preperatory change to allow compiling ww_mutex standalone.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/linux/mutex.h | 11 ----------- 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;
|