linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] locking/mutex: Remove repeated declaration
@ 2021-03-24  5:40 Shaokun Zhang
  2021-03-24  7:22 ` [tip: locking/core] " tip-bot2 for Shaokun Zhang
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Shaokun Zhang @ 2021-03-24  5:40 UTC (permalink / raw)
  To: linux-kernel
  Cc: Shaokun Zhang, Peter Zijlstra, Ingo Molnar, Will Deacon,
	Waiman Long, Boqun Feng

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.

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Acked-by: Waiman Long <longman@redhat.com>
Signed-off-by: Shaokun Zhang <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 0cd631a19727..e7a126796937 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;
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [tip: locking/core] locking/mutex: Remove repeated declaration
  2021-03-24  5:40 [PATCH v2] locking/mutex: Remove repeated declaration Shaokun Zhang
@ 2021-03-24  7:22 ` 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
  2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Shaokun Zhang @ 2021-03-24  7:22 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Shaokun Zhang, Ingo Molnar, Waiman Long, x86, linux-kernel

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;

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [tip: locking/core] locking/mutex: Remove repeated declaration
  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
  2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Shaokun Zhang @ 2021-03-25  8:44 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Shaokun Zhang, Ingo Molnar, Waiman Long, x86, linux-kernel

The following commit has been merged into the locking/core branch of tip:

Commit-ID:     93b02d29fbdbc221c866664adcaf0e85be9f8008
Gitweb:        https://git.kernel.org/tip/93b02d29fbdbc221c866664adcaf0e85be9f8008
Author:        Shaokun Zhang <zhangshaokun@hisilicon.com>
AuthorDate:    Wed, 24 Mar 2021 13:40:40 +08:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 25 Mar 2021 09:42:48 +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;

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [tip: locking/core] locking/mutex: Remove repeated declaration
  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
  2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Shaokun Zhang @ 2021-03-25 11:08 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Shaokun Zhang, Ingo Molnar, Waiman Long, x86, linux-kernel

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;

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-03-25 11:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).