Update descriptions and add Forwarded fields for liblockdep build fixes

This commit is contained in:
Ben Hutchings 2018-08-29 00:39:50 +01:00
parent 01900fbc73
commit d87efc40a0
2 changed files with 16 additions and 9 deletions

View File

@ -1,16 +1,19 @@
From 2b14169744f9aeccd09c30926d9f0b6a80ff6156 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 11 Feb 2018 06:24:15 +0000
Subject: [PATCH 3/3] lockdep: Stub NMI watchdog reset
Subject: liblockdep: Stub NMI watchdog reset
Forwarded: https://lore.kernel.org/lkml/20180828233721.GF18030@decadent.org.uk/T/#u
lockdep.c now includes <linux/nmi.h> and requires touch_nmi_watchdog(),
so provide those for liblockdep.
Fixes: 88f1c87de11a ("locking/lockdep: Avoid triggering hardlockup from ...")
[bwh: Write a longer description]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
tools/include/linux/nmi.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 tools/include/linux/nmi.h
diff --git a/tools/include/linux/nmi.h b/tools/include/linux/nmi.h
new file mode 100644
index 000000000000..81ffb39343cc
--- /dev/null
+++ b/tools/include/linux/nmi.h
@@ -0,0 +1,12 @@
@ -26,6 +29,3 @@ index 000000000000..81ffb39343cc
+}
+
+#endif
--
2.16.1

View File

@ -1,7 +1,14 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 03 Jul 2018 06:19:07 +0100
Subject: lockdep: Stub task_struct::state
Subject: liblockdep: Stub task_struct::state
Forwarded: https://lore.kernel.org/lkml/20180828233752.GG18030@decadent.org.uk/T/#u
lockdep_print_held_locks() now checks task_struct::state. Define it
so that all tasks are assumed to be running, since we have no
reasonble way to tell in user-space.
Fixes: 8cc05c71ba5f ("locking/lockdep: Move sanity check to inside ...")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
--- a/tools/include/linux/lockdep.h
+++ b/tools/include/linux/lockdep.h