- fix building with 3.14.25

- rel 3

diff --git a/linux-3.14.25.patch b/linux-3.14.25.patch
new file mode 100644 (file)
index 0000000..8775540
--- /dev/null
+++ b/linux-3.14.25.patch
@@ -0,0 +1,11 @@
+--- /home/users/baggins/devel/PLD/rpm/BUILD/lttng-modules-2.5.1/instrumentation/events/lttng-module/compaction.h~      2014-10-20 22:48:47.000000000 +0200
++++ /home/users/baggins/devel/PLD/rpm/BUILD/lttng-modules-2.5.1/instrumentation/events/lttng-module/compaction.h       2014-11-23 15:28:33.501139643 +0100
+@@ -46,7 +46,7 @@
+       TP_ARGS(nr_scanned, nr_taken)
+ )
+ 
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) || ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)))
+ TRACE_EVENT(mm_compaction_migratepages,
+ 
+       TP_PROTO(unsigned long nr_all,

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 4034ca8ea59f103c71be198911e01bd2eafd2d6e..a7e893e8c4cbbdc1b03d8c0f564acaad0ddb2bd3 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -20,7 +20,7 @@ exit 1
 %define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
-%define                rel     2
+%define                rel     3
 %define                pname   lttng-modules
 Summary:       LTTng 2.x kernel modules
 Summary(pl.UTF-8):     Moduły jądra LTTng 2.x
@@ -33,6 +33,7 @@ Source0:      http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
 # Source0-md5: 2d99bb7311ba92e82e3b675f0b8dee7d
 Patch0:                build.patch
 Patch1:                linux-3.17.patch
+Patch2:                linux-3.14.25.patch
 URL:           http://lttng.org/
 %if %{with dist_kernel}
 BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.38
@@ -105,6 +106,7 @@ p=`pwd`\
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{expand:%bkpkg}