* [PATCH] locking/lockdep: Delete unnecesary #include
@ 2018-08-28 20:33 Ben Hutchings
2018-08-28 20:48 ` Steven Rostedt
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Ben Hutchings @ 2018-08-28 20:33 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Will Deacon
Cc: linux-kernel, Joel Fernandes, Steven Rostedt, Sasha Levin
[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]
Commit c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints and u
nify their usage") added the inclusion of <trace/events/preemptirq.h>.
liblockdep doesn't have a stub version of that header so now fails to
build.
However, commit bff1b208a5d1 ("tracing: Partial revert of "tracing:
Centralize preemptirq tracepoints and unify their usage"") removed the
use of functions declared in that header. So delete the #include.
Fixes: c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints ...")
Fixes: bff1b208a5d1 ("tracing: Partial revert of "tracing: Centralize ...")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
kernel/locking/lockdep.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e406c5fdb41e..dd13f865ad40 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -55,7 +55,6 @@
#include "lockdep_internals.h"
-#include <trace/events/preemptirq.h>
#define CREATE_TRACE_POINTS
#include <trace/events/lock.h>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] locking/lockdep: Delete unnecesary #include
2018-08-28 20:33 [PATCH] locking/lockdep: Delete unnecesary #include Ben Hutchings
@ 2018-08-28 20:48 ` Steven Rostedt
2018-08-29 9:31 ` Peter Zijlstra
2018-09-10 12:38 ` [tip:locking/urgent] locking/lockdep: Delete unnecessary #include tip-bot for Ben Hutchings
2 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2018-08-28 20:48 UTC (permalink / raw)
To: Ben Hutchings
Cc: Peter Zijlstra, Ingo Molnar, Will Deacon, linux-kernel,
Joel Fernandes, Sasha Levin
On Tue, 28 Aug 2018 21:33:15 +0100
Ben Hutchings <ben@decadent.org.uk> wrote:
> Commit c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints and u
> nify their usage") added the inclusion of <trace/events/preemptirq.h>.
> liblockdep doesn't have a stub version of that header so now fails to
> build.
>
> However, commit bff1b208a5d1 ("tracing: Partial revert of "tracing:
> Centralize preemptirq tracepoints and unify their usage"") removed the
> use of functions declared in that header. So delete the #include.
>
> Fixes: c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints ...")
> Fixes: bff1b208a5d1 ("tracing: Partial revert of "tracing: Centralize ...")
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Peter, you want to take this to Ingo?
-- Steve
> ---
> kernel/locking/lockdep.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> index e406c5fdb41e..dd13f865ad40 100644
> --- a/kernel/locking/lockdep.c
> +++ b/kernel/locking/lockdep.c
> @@ -55,7 +55,6 @@
>
> #include "lockdep_internals.h"
>
> -#include <trace/events/preemptirq.h>
> #define CREATE_TRACE_POINTS
> #include <trace/events/lock.h>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] locking/lockdep: Delete unnecesary #include
2018-08-28 20:33 [PATCH] locking/lockdep: Delete unnecesary #include Ben Hutchings
2018-08-28 20:48 ` Steven Rostedt
@ 2018-08-29 9:31 ` Peter Zijlstra
2018-08-29 13:49 ` Steven Rostedt
2018-09-10 12:38 ` [tip:locking/urgent] locking/lockdep: Delete unnecessary #include tip-bot for Ben Hutchings
2 siblings, 1 reply; 6+ messages in thread
From: Peter Zijlstra @ 2018-08-29 9:31 UTC (permalink / raw)
To: Ben Hutchings
Cc: Ingo Molnar, Will Deacon, linux-kernel, Joel Fernandes,
Steven Rostedt, Sasha Levin
On Tue, Aug 28, 2018 at 09:33:15PM +0100, Ben Hutchings wrote:
> Commit c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints and u
> nify their usage") added the inclusion of <trace/events/preemptirq.h>.
> liblockdep doesn't have a stub version of that header so now fails to
> build.
>
> However, commit bff1b208a5d1 ("tracing: Partial revert of "tracing:
> Centralize preemptirq tracepoints and unify their usage"") removed the
> use of functions declared in that header. So delete the #include.
>
> Fixes: c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints ...")
> Fixes: bff1b208a5d1 ("tracing: Partial revert of "tracing: Centralize ...")
There's no actual breakage because of this extra include, is there?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] locking/lockdep: Delete unnecesary #include
2018-08-29 9:31 ` Peter Zijlstra
@ 2018-08-29 13:49 ` Steven Rostedt
2018-08-29 18:30 ` Ben Hutchings
0 siblings, 1 reply; 6+ messages in thread
From: Steven Rostedt @ 2018-08-29 13:49 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ben Hutchings, Ingo Molnar, Will Deacon, linux-kernel,
Joel Fernandes, Sasha Levin
On Wed, 29 Aug 2018 11:31:21 +0200
Peter Zijlstra <peterz@infradead.org> wrote:
> On Tue, Aug 28, 2018 at 09:33:15PM +0100, Ben Hutchings wrote:
> > Commit c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints and u
> > nify their usage") added the inclusion of <trace/events/preemptirq.h>.
> > liblockdep doesn't have a stub version of that header so now fails to
> > build.
> >
> > However, commit bff1b208a5d1 ("tracing: Partial revert of "tracing:
> > Centralize preemptirq tracepoints and unify their usage"") removed the
> > use of functions declared in that header. So delete the #include.
> >
> > Fixes: c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints ...")
> > Fixes: bff1b208a5d1 ("tracing: Partial revert of "tracing: Centralize ...")
>
> There's no actual breakage because of this extra include, is there?
I believe the user tool in tools/lib/lockdep fails because of it.
Although, I just tried building it myself, and it fails because of
nmi.h header file.
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] locking/lockdep: Delete unnecesary #include
2018-08-29 13:49 ` Steven Rostedt
@ 2018-08-29 18:30 ` Ben Hutchings
0 siblings, 0 replies; 6+ messages in thread
From: Ben Hutchings @ 2018-08-29 18:30 UTC (permalink / raw)
To: Steven Rostedt, Peter Zijlstra
Cc: Ingo Molnar, Will Deacon, linux-kernel, Joel Fernandes, Sasha Levin
[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]
On Wed, 2018-08-29 at 09:49 -0400, Steven Rostedt wrote:
> On Wed, 29 Aug 2018 11:31:21 +0200
> Peter Zijlstra <peterz@infradead.org> wrote:
>
> > On Tue, Aug 28, 2018 at 09:33:15PM +0100, Ben Hutchings wrote:
> > > Commit c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints and u
> > > nify their usage") added the inclusion of <trace/events/preemptirq.h>.
> > > liblockdep doesn't have a stub version of that header so now fails to
> > > build.
> > >
> > > However, commit bff1b208a5d1 ("tracing: Partial revert of "tracing:
> > > Centralize preemptirq tracepoints and unify their usage"") removed the
> > > use of functions declared in that header. So delete the #include.
> > >
> > > Fixes: c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints ...")
> > > Fixes: bff1b208a5d1 ("tracing: Partial revert of "tracing: Centralize ...")
> >
> > There's no actual breakage because of this extra include, is there?
>
> I believe the user tool in tools/lib/lockdep fails because of it.
> Although, I just tried building it myself, and it fails because of
> nmi.h header file.
Sasha already sent fixes to fix that and another missing definition,
but they haven't been applied.
Ben.
--
Ben Hutchings
For every complex problem
there is a solution that is simple, neat, and wrong.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:locking/urgent] locking/lockdep: Delete unnecessary #include
2018-08-28 20:33 [PATCH] locking/lockdep: Delete unnecesary #include Ben Hutchings
2018-08-28 20:48 ` Steven Rostedt
2018-08-29 9:31 ` Peter Zijlstra
@ 2018-09-10 12:38 ` tip-bot for Ben Hutchings
2 siblings, 0 replies; 6+ messages in thread
From: tip-bot for Ben Hutchings @ 2018-09-10 12:38 UTC (permalink / raw)
To: linux-tip-commits
Cc: alexander.levin, ben, linux-kernel, hpa, joel, rostedt,
will.deacon, mingo, peterz, tglx, torvalds
Commit-ID: dc5591a03f1d6dae6b11cdf1d74b023f7ac0fdbf
Gitweb: https://git.kernel.org/tip/dc5591a03f1d6dae6b11cdf1d74b023f7ac0fdbf
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Tue, 28 Aug 2018 21:33:15 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 10 Sep 2018 13:48:25 +0200
locking/lockdep: Delete unnecessary #include
Commit:
c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints and unify their usage")
added the inclusion of <trace/events/preemptirq.h>.
liblockdep doesn't have a stub version of that header so now fails to build.
However, commit:
bff1b208a5d1 ("tracing: Partial revert of "tracing: Centralize preemptirq tracepoints and unify their usage"")
removed the use of functions declared in that header. So delete the #include.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sasha Levin <alexander.levin@verizon.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Fixes: bff1b208a5d1 ("tracing: Partial revert of "tracing: Centralize ...")
Fixes: c3bc8fd637a9 ("tracing: Centralize preemptirq tracepoints ...")
Link: http://lkml.kernel.org/r/20180828203315.GD18030@decadent.org.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/locking/lockdep.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e406c5fdb41e..dd13f865ad40 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -55,7 +55,6 @@
#include "lockdep_internals.h"
-#include <trace/events/preemptirq.h>
#define CREATE_TRACE_POINTS
#include <trace/events/lock.h>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-09-10 12:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-28 20:33 [PATCH] locking/lockdep: Delete unnecesary #include Ben Hutchings
2018-08-28 20:48 ` Steven Rostedt
2018-08-29 9:31 ` Peter Zijlstra
2018-08-29 13:49 ` Steven Rostedt
2018-08-29 18:30 ` Ben Hutchings
2018-09-10 12:38 ` [tip:locking/urgent] locking/lockdep: Delete unnecessary #include tip-bot for Ben Hutchings
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).