diff --git a/debian/changelog b/debian/changelog index 66bbdd24a..6132e475f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ linux-tools (4.5~rc4-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate + [ Ben Hutchings ] + * lockdep: Add missing macros + -- Ben Hutchings Thu, 18 Feb 2016 03:19:14 +0000 linux-tools (4.4-1) unstable; urgency=medium diff --git a/debian/patches/lockdep-add-missing-macros.patch b/debian/patches/lockdep-add-missing-macros.patch new file mode 100644 index 000000000..c5691a19e --- /dev/null +++ b/debian/patches/lockdep-add-missing-macros.patch @@ -0,0 +1,32 @@ +From: Ben Hutchings +Date: Thu, 18 Feb 2016 03:34:25 +0000 +Subject: lockdep: Add missing macros + +liblockdep is broken again due to lockdep using kernel macros that it +doesn't have substitutes for. +--- +--- a/tools/lib/lockdep/uinclude/linux/kernel.h ++++ b/tools/lib/lockdep/uinclude/linux/kernel.h +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #ifndef container_of + #define container_of(ptr, type, member) ({ \ +--- a/tools/lib/lockdep/uinclude/linux/list.h ++++ b/tools/lib/lockdep/uinclude/linux/list.h +@@ -1 +1,2 @@ + #include "../../../include/linux/list.h" ++#define hlist_for_each_entry_rcu hlist_for_each_entry +--- a/tools/lib/lockdep/uinclude/linux/compiler.h ++++ b/tools/lib/lockdep/uinclude/linux/compiler.h +@@ -3,6 +3,7 @@ + + #define __used __attribute__((__unused__)) + #define unlikely ++#define READ_ONCE(x) (x) + #define WRITE_ONCE(x, val) x=(val) + #define RCU_INIT_POINTER(p, v) p=(v) + diff --git a/debian/patches/series b/debian/patches/series index 1fdb100a8..88588321a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ revert-perf-build-fix-libunwind-feature-detection-on.patch alpha-uapi-add-support-for-__sane_userspace_types__.patch perf-fix-misleadingly-indented-assignment-whitespace.patch perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch +lockdep-add-missing-macros.patch