2019-05-16 19:27:31

by Anders Roxell

[permalink] [raw]
Subject: [PATCH] locking/lockdep: remove print_lock_trace function

gcc warns that function print_lock_trace() is unused if
CONFIG_PROVE_LOCKING isn't set.

../kernel/locking/lockdep.c:2820:13: warning: ‘print_lock_trace’ defined
but not used [-Wunused-function]
static void print_lock_trace(struct lock_trace *trace, unsigned int
spaces)

Rework so we remove the function if CONFIG_PROVE_LOCKING isn't set.

Fixes: c120bce78065 ("lockdep: Simplify stack trace handling")
Signed-off-by: Anders Roxell <[email protected]>
---
kernel/locking/lockdep.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index d06190fa5082..df1bd3ba56bc 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -2816,10 +2816,6 @@ static inline int validate_chain(struct task_struct *curr,
{
return 1;
}
-
-static void print_lock_trace(struct lock_trace *trace, unsigned int spaces)
-{
-}
#endif

/*
--
2.20.1


Subject: [tip:locking/core] locking/lockdep: Remove the unused print_lock_trace() function

Commit-ID: c0090c4c85c27d1fa3d785c935501b7207cd2869
Gitweb: https://git.kernel.org/tip/c0090c4c85c27d1fa3d785c935501b7207cd2869
Author: Anders Roxell <[email protected]>
AuthorDate: Thu, 16 May 2019 21:13:26 +0200
Committer: Ingo Molnar <[email protected]>
CommitDate: Fri, 24 May 2019 09:05:46 +0200

locking/lockdep: Remove the unused print_lock_trace() function

gcc warns that function print_lock_trace() is unused if
CONFIG_PROVE_LOCKING isn't set:

../kernel/locking/lockdep.c:2820:13: warning: ‘print_lock_trace’ defined but not used [-Wunused-function]

Rework so we remove the function if CONFIG_PROVE_LOCKING isn't set.

Signed-off-by: Anders Roxell <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Fixes: c120bce78065 ("lockdep: Simplify stack trace handling")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/locking/lockdep.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 6b283b4f87aa..8d32ae7768a7 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -2818,10 +2818,6 @@ static inline int validate_chain(struct task_struct *curr,
{
return 1;
}
-
-static void print_lock_trace(struct lock_trace *trace, unsigned int spaces)
-{
-}
#endif

/*

2019-05-24 18:47:48

by Will Deacon

[permalink] [raw]
Subject: Re: [PATCH] locking/lockdep: remove print_lock_trace function

On Thu, May 16, 2019 at 09:13:26PM +0200, Anders Roxell wrote:
> gcc warns that function print_lock_trace() is unused if
> CONFIG_PROVE_LOCKING isn't set.
>
> ../kernel/locking/lockdep.c:2820:13: warning: ‘print_lock_trace’ defined
> but not used [-Wunused-function]
> static void print_lock_trace(struct lock_trace *trace, unsigned int
> spaces)
>
> Rework so we remove the function if CONFIG_PROVE_LOCKING isn't set.
>
> Fixes: c120bce78065 ("lockdep: Simplify stack trace handling")
> Signed-off-by: Anders Roxell <[email protected]>
> ---
> kernel/locking/lockdep.c | 4 ----
> 1 file changed, 4 deletions(-)

Acked-by: Will Deacon <[email protected]>

Will