diff --git a/debian/patches/bugfix/all/lockdep-stub-nmi-watchdog-reset.patch b/debian/patches/bugfix/all/lockdep-stub-nmi-watchdog-reset.patch index 49701917d..cd04d0300 100644 --- a/debian/patches/bugfix/all/lockdep-stub-nmi-watchdog-reset.patch +++ b/debian/patches/bugfix/all/lockdep-stub-nmi-watchdog-reset.patch @@ -1,16 +1,19 @@ -From 2b14169744f9aeccd09c30926d9f0b6a80ff6156 Mon Sep 17 00:00:00 2001 From: Bastian Blank 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 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 --- 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 - diff --git a/debian/patches/bugfix/all/lockdep-stub-task_struct-state.patch b/debian/patches/bugfix/all/lockdep-stub-task_struct-state.patch index b13b08edd..90b2adc2a 100644 --- a/debian/patches/bugfix/all/lockdep-stub-task_struct-state.patch +++ b/debian/patches/bugfix/all/lockdep-stub-task_struct-state.patch @@ -1,7 +1,14 @@ From: Ben Hutchings 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 --- --- a/tools/include/linux/lockdep.h +++ b/tools/include/linux/lockdep.h