2021-03-24 22:34:38

by Zhangshaokun

Subject: [PATCH v2] 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.

Cc: Peter Zijlstra <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Waiman Long <[email protected]>
Cc: Boqun Feng <[email protected]>
Acked-by: Waiman Long <[email protected]>
Signed-off-by: Shaokun Zhang <[email protected]>
---
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

2021-03-25 01:28:03

by tip-bot2 for Alexey Makhalov

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 <[email protected]>
AuthorDate: Wed, 24 Mar 2021 13:40:40 +08:00
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Waiman Long <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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;

2021-03-25 08:46:12

by tip-bot2 for Alexey Makhalov

Subject: [tip: locking/core] locking/mutex: Remove repeated declaration

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 <[email protected]>
AuthorDate: Wed, 24 Mar 2021 13:40:40 +08:00
Committer: Thomas Gleixner <[email protected]>
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 <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Waiman Long <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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;

2021-03-25 11:10:03

by tip-bot2 for Alexey Makhalov

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 <[email protected]>
AuthorDate: Wed, 24 Mar 2021 13:40:40 +08:00
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Waiman Long <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
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;