[linux-tools] 02/02: lockdep: Add missing macros

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux-tools.

commit 32be752344acb9d171a1fd9d4d8e02ebdf3d6e48
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Feb 18 04:14:17 2016 +0000

    lockdep: Add missing macros
---
 debian/changelog                                |  3 +++
 debian/patches/lockdep-add-missing-macros.patch | 32 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 66bbdd2..6132e47 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 <ben at decadent.org.uk>  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 0000000..c5691a1
--- /dev/null
+++ b/debian/patches/lockdep-add-missing-macros.patch
@@ -0,0 +1,32 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+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 <linux/rcu.h>
+ #include <linux/hardirq.h>
+ #include <linux/kern_levels.h>
++#include <linux/compiler.h>
+ 
+ #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 1fdb100..8858832 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git