locking/lockdep: Delete unnecesary #include
PATCH 1/1 locking/lockdep: Delete unnecesary #include
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.
--- kernel/locking/lockdep.c | 1 - 1 file changed, 1 deletion(-)
kernel/locking/lockdep.c +0 -1
@@ -55,7 +55,6 @@#include "lockdep_internals.h" -#include <trace/events/preemptirq.h> #define CREATE_TRACE_POINTS #include <trace/events/lock.h>
Quoted 5 lines · On Tue, 28 Aug 2018 21:33:15 +0100 Ben Hutchings <[email protected]> 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.
Quoted 7 lines
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 <[email protected]>
Peter, you want to take this to Ingo?
-- Steve
Quoted 16 lines
--- kernel/locking/lockdep.c | 1 - 1 file changed, 1 deletion(-)kernel/locking/lockdep.c +0
-1@@ -55,7 +55,6 @@#include "lockdep_internals.h" -#include <trace/events/preemptirq.h> #define CREATE_TRACE_POINTS #include <trace/events/lock.h>
Peter Zijlstra
maintainerQuoted 11 lines · Ben Hutchings
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?
Quoted 6 lines · On Wed, 29 Aug 2018 11:31:21 +0200 Peter Zijlstra <[email protected]> wrote:
Quoted 5 lines · Ben Hutchings
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.
Quoted 8 lines
Quoted 6 lines
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
Quoted 13 lines · Steven Rostedt
Quoted 10 lines · On Wed, 29 Aug 2018 11:31:21 +0200 Peter Zijlstra <[email protected]> wrote:
Quoted 9 lines · Ben Hutchings
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.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
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/lockdepfails because of it. Although, I just tried building it myself, and it fails because ofnmi.hheader file.
Sasha already sent fixes to fix that and another missing definition, but they haven't been applied.
Ben.
Signature · 3 lines
Ben Hutchings For every complex problem there is a solution that is simple, neat, and wrong.
tip-bot for Ben Hutchings
merge bot[tip:locking/urgent] locking/lockdep: Delete unnecessary #include
In reply to Ben Hutchingslocking/lockdep: Delete unnecessary #include
Commit-ID: dc5591a03f1d6dae6b11cdf1d74b023f7ac0fdbf Gitweb: https://git.kernel.org/tip/dc5591a03f1d6dae6b11cdf1d74b023f7ac0fdbf Author: Ben Hutchings <[email protected]> AuthorDate: Tue, 28 Aug 2018 21:33:15 +0100 Committer: Ingo Molnar <[email protected]> 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.
--- kernel/locking/lockdep.c | 1 - 1 file changed, 1 deletion(-)
kernel/locking/lockdep.c +0 -1
@@ -55,7 +55,6 @@#include "lockdep_internals.h" -#include <trace/events/preemptirq.h> #define CREATE_TRACE_POINTS #include <trace/events/lock.h>