From 884aedc0b44da426056f18e14617aea368176aaa Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 1 Oct 2017 15:44:25 +0100 Subject: [PATCH] liblockdep: Define pr_cont() --- debian/changelog | 1 + .../tools-lib-lockdep-define-pr_cont.patch | 25 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+) create mode 100644 debian/patches/bugfix/all/tools-lib-lockdep-define-pr_cont.patch diff --git a/debian/changelog b/debian/changelog index df5a04103..d9256f1ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium * [armhf] dts: exynos: Add dwc3 SUSPHY quirk (Closes: #843448) * liblockdep: Make missing function declarations fatal errors, to catch use of missing kernel APIs + * liblockdep: Define pr_cont() [ Uwe Kleine-König ] * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin diff --git a/debian/patches/bugfix/all/tools-lib-lockdep-define-pr_cont.patch b/debian/patches/bugfix/all/tools-lib-lockdep-define-pr_cont.patch new file mode 100644 index 000000000..2975cfae9 --- /dev/null +++ b/debian/patches/bugfix/all/tools-lib-lockdep-define-pr_cont.patch @@ -0,0 +1,25 @@ +From: Ben Hutchings +Date: Sun, 01 Oct 2017 15:39:34 +0100 +Subject: tools/lib/lockdep: Define pr_cont() + +lockdep.c now also uses pr_cont(), so we need to implement it in +liblockdep. + +It is currently always used to continue warning lines, so define +pr_cont() the same as pr_warn(). If this changes, we might need to +record the last log level in a TLS variable and have pr_cont() check +that. + +Signed-off-by: Ben Hutchings +--- +--- a/tools/include/linux/lockdep.h ++++ b/tools/include/linux/lockdep.h +@@ -47,6 +47,8 @@ static inline int debug_locks_off(void) + #define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__) + #define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__) + #define pr_warn pr_err ++/* XXX we assume pr_cont() is only used for warnings */ ++#define pr_cont pr_warn + + #define list_del_rcu list_del + diff --git a/debian/patches/series b/debian/patches/series index 313adcc0c..c69216eed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -136,3 +136,4 @@ bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch bugfix/all/cpupower-bump-soname-version.patch bugfix/all/cpupower-fix-checks-for-cpu-existence.patch +bugfix/all/tools-lib-lockdep-define-pr_cont.patch