lkml.org 
[lkml]   [2021]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: locking/core] locking/mutex: Remove repeated declaration
The following commit has been merged into the locking/core branch of tip:

Commit-ID: 5965a7adbd72dd9b288c0911cb73719fed1efa08
Gitweb: https://git.kernel.org/tip/5965a7adbd72dd9b288c0911cb73719fed1efa08
Author: Shaokun Zhang <zhangshaokun@hisilicon.com>
AuthorDate: Wed, 24 Mar 2021 13:40:40 +08:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 24 Mar 2021 08:15:19 +01:00

locking/mutex: Remove repeated declaration

Commit 0cd39f4600ed ("locking/seqlock, headers: Untangle the spaghetti monster")
introduces 'struct ww_acquire_ctx' again, remove the repeated declaration and move
the pre-declarations to the top.

Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Waiman Long <longman@redhat.com>
Link: https://lore.kernel.org/r/1616564440-61318-1-git-send-email-zhangshaokun@hisilicon.com
---
include/linux/mutex.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 0cd631a..e7a1267 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -20,6 +20,7 @@
#include <linux/osq_lock.h>
#include <linux/debug_locks.h>

+struct ww_class;
struct ww_acquire_ctx;

/*
@@ -65,9 +66,6 @@ struct mutex {
#endif
};

-struct ww_class;
-struct ww_acquire_ctx;
-
struct ww_mutex {
struct mutex base;
struct ww_acquire_ctx *ctx;
\
 
 \ /
  Last update: 2021-03-24 08:23    [W:0.090 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site