diff --git a/debian/changelog b/debian/changelog index 252fecebf..bb71f2de5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-tools (4.4~rc4-1~exp1) UNRELEASED; urgency=medium + + * New upstream release candidate + + -- Ben Hutchings Mon, 14 Dec 2015 00:48:22 +0000 + linux-tools (4.3.1-1) unstable; urgency=medium * New upstream stable update diff --git a/debian/patches/lockdep-fix-headers.patch b/debian/patches/lockdep-fix-headers.patch deleted file mode 100644 index e2c1db8e7..000000000 --- a/debian/patches/lockdep-fix-headers.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Ben Hutchings -Date: Thu, 13 Aug 2015 20:48:12 +0200 -Subject: liblockdep: Define WRITE_ONCE(), used by . - -Signed-off-by: Ben Hutchings ---- ---- a/tools/lib/lockdep/uinclude/linux/compiler.h -+++ b/tools/lib/lockdep/uinclude/linux/compiler.h -@@ -4,4 +4,10 @@ - #define __used __attribute__((__unused__)) - #define unlikely - -+#define __ACCESS_ONCE(x) ({ \ -+ __attribute__((__unused__)) typeof(x) __var = (__force typeof(x)) 0; \ -+ (volatile typeof(x) *)&(x); }) -+#define ACCESS_ONCE(x) (*__ACCESS_ONCE(x)) -+#define WRITE_ONCE(x, val) (ACCESS_ONCE(x) = (val)) -+ - #endif diff --git a/debian/patches/series b/debian/patches/series index d5becb893..c8eedbf7f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,7 +7,6 @@ kbuild-fix-recordmcount-dependency.patch usbip-include-uninstalled-linux-usbip-h.patch tools-perf-man-date.patch lockdep-fix-oot-build.patch -lockdep-fix-headers.patch lockdep-fix-soname.patch tools-perf-remove-shebangs.patch tools-lib-traceevent-use-ldflags.patch