From: "tip-bot2 for Shaokun Zhang" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>,
Ingo Molnar <mingo@kernel.org>, Waiman Long <longman@redhat.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] locking/mutex: Remove repeated declaration
Date: Thu, 25 Mar 2021 11:08:30 -0000 [thread overview]
Message-ID: <161667051052.398.6239082761517753119.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1616564440-61318-1-git-send-email-zhangshaokun@hisilicon.com>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 8af856d18bfbe89676ade38caa2a5d06f75f211d
Gitweb: https://git.kernel.org/tip/8af856d18bfbe89676ade38caa2a5d06f75f211d
Author: Shaokun Zhang <zhangshaokun@hisilicon.com>
AuthorDate: Wed, 24 Mar 2021 13:40:40 +08:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 25 Mar 2021 12:02:06 +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;
prev parent reply other threads:[~2021-03-25 11:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 5:40 [PATCH v2] locking/mutex: Remove repeated declaration Shaokun Zhang
2021-03-24 7:22 ` [tip: locking/core] " tip-bot2 for Shaokun Zhang
2021-03-25 8:44 ` tip-bot2 for Shaokun Zhang
2021-03-25 11:08 ` tip-bot2 for Shaokun Zhang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161667051052.398.6239082761517753119.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@kernel.org \
--cc=x86@kernel.org \
--cc=zhangshaokun@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).