linux-kernel - [tip: locking/core] locking/mutex: Remove repeated declaration

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 25 Mar 2021 11:08:30 -0000
From:   "tip-bot2 for Shaokun Zhang" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Shaokun Zhang <zhangshaokun@...ilicon.com>,
        Ingo Molnar <mingo@...nel.org>,
        Waiman Long <longman@...hat.com>, x86@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [tip: locking/core] locking/mutex: Remove repeated declaration

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@...ilicon.com>
AuthorDate:    Wed, 24 Mar 2021 13:40:40 +08:00
Committer:     Ingo Molnar <mingo@...nel.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@...ilicon.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Acked-by: Waiman Long <longman@...hat.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;