* [PATCH] locking/lockdep: update the comment for __lock_release()
@ 2019-11-04 9:12 Dan Carpenter
2019-11-04 10:14 ` Peter Zijlstra
2019-11-13 10:57 ` [tip: locking/core] locking/lockdep: Update " tip-bot2 for Dan Carpenter
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2019-11-04 9:12 UTC (permalink / raw)
To: Peter Zijlstra; +Cc: Ingo Molnar, Will Deacon, linux-kernel, kernel-janitors
This changes "to the list" to "from the list" and also deletes the
obsolete comment about the "@nested" argument. The "nested" argument
was removed in commit 5facae4f3549 ("locking/lockdep: Remove unused
@nested argument from lock_release()").
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
kernel/locking/lockdep.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 8123518f9045..32282e7112d3 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4208,11 +4208,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip)
}
/*
- * Remove the lock to the list of currently held locks - this gets
+ * Remove the lock from the list of currently held locks - this gets
* called on mutex_unlock()/spin_unlock*() (or on a failed
* mutex_lock_interruptible()).
- *
- * @nested is an hysterical artifact, needs a tree wide cleanup.
*/
static int
__lock_release(struct lockdep_map *lock, unsigned long ip)
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] locking/lockdep: update the comment for __lock_release()
2019-11-04 9:12 [PATCH] locking/lockdep: update the comment for __lock_release() Dan Carpenter
@ 2019-11-04 10:14 ` Peter Zijlstra
2019-11-13 10:57 ` [tip: locking/core] locking/lockdep: Update " tip-bot2 for Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Peter Zijlstra @ 2019-11-04 10:14 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Ingo Molnar, Will Deacon, linux-kernel, kernel-janitors
On Mon, Nov 04, 2019 at 12:12:52PM +0300, Dan Carpenter wrote:
> This changes "to the list" to "from the list" and also deletes the
> obsolete comment about the "@nested" argument. The "nested" argument
> was removed in commit 5facae4f3549 ("locking/lockdep: Remove unused
> @nested argument from lock_release()").
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks Dan!
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip: locking/core] locking/lockdep: Update the comment for __lock_release()
2019-11-04 9:12 [PATCH] locking/lockdep: update the comment for __lock_release() Dan Carpenter
2019-11-04 10:14 ` Peter Zijlstra
@ 2019-11-13 10:57 ` tip-bot2 for Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Dan Carpenter @ 2019-11-13 10:57 UTC (permalink / raw)
To: linux-tip-commits
Cc: Dan Carpenter, Peter Zijlstra (Intel),
Andrew Morton, Linus Torvalds, Paul E. McKenney, Thomas Gleixner,
Will Deacon, Will Deacon, Ingo Molnar, Borislav Petkov,
linux-kernel
The following commit has been merged into the locking/core branch of tip:
Commit-ID: c759bc47db0fb8c02ecf2b2acc4b7fc6e4099039
Gitweb: https://git.kernel.org/tip/c759bc47db0fb8c02ecf2b2acc4b7fc6e4099039
Author: Dan Carpenter <dan.carpenter@oracle.com>
AuthorDate: Mon, 04 Nov 2019 12:12:52 +03:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 13 Nov 2019 11:07:48 +01:00
locking/lockdep: Update the comment for __lock_release()
This changes "to the list" to "from the list" and also deletes the
obsolete comment about the "@nested" argument.
The "nested" argument was removed in this commit, earlier this year:
5facae4f3549 ("locking/lockdep: Remove unused @nested argument from lock_release()").
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20191104091252.GA31509@mwanda
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/locking/lockdep.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 8123518..32282e7 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4208,11 +4208,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip)
}
/*
- * Remove the lock to the list of currently held locks - this gets
+ * Remove the lock from the list of currently held locks - this gets
* called on mutex_unlock()/spin_unlock*() (or on a failed
* mutex_lock_interruptible()).
- *
- * @nested is an hysterical artifact, needs a tree wide cleanup.
*/
static int
__lock_release(struct lockdep_map *lock, unsigned long ip)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-13 10:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-04 9:12 [PATCH] locking/lockdep: update the comment for __lock_release() Dan Carpenter
2019-11-04 10:14 ` Peter Zijlstra
2019-11-13 10:57 ` [tip: locking/core] locking/lockdep: Update " tip-bot2 for Dan Carpenter
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).