summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-12-10 03:22:59 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:54 +0000
commit7a16c50aec5989ede2c839ae68a99691ffce29e7 (patch)
tree79483e000ba1a55f09f249529bec8bc0a695a713 /meta/recipes-kernel/lttng
parent662f39e004327de6d81b788ef8193cf54bf95337 (diff)
downloadpoky-7a16c50aec5989ede2c839ae68a99691ffce29e7.tar.gz
lttng-modules: fix mm_compaction_isolate_template build
linux-stable integrated the 3.16 commit f8c9301fa5a2a [mm/compaction: do not count migratepages when unnecessary] with the 3.14.25 update. So we have to update the lttng-module linux version codes to use the new definition in builds greater than 3.14.24 or 3.16. (From OE-Core rev: cf76820379746e91fc4cf01895cb98cc56987002) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch41
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch b/meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch
new file mode 100644
index 0000000000..a99871a62e
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch
@@ -0,0 +1,41 @@
1From af48c7b08de4b811d3d974e65e362b86ce8c4a34 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Wed, 10 Dec 2014 03:19:28 -0500
4Subject: [PATCH] compaction: fix mm_compaction_isolate_template build
5
6linux-stable integrated the 3.16 commit f8c9301fa5a2a [mm/compaction: do
7not count migratepages when unnecessary] with the 3.14.25 update.
8
9So we have to update the lttng-module linux version codes to use the
10new definition in builds greater than 3.14.24 or 3.16.
11
12Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
13---
14 instrumentation/events/lttng-module/compaction.h | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h
18index 22024e9ee582..07afbe06f1a6 100644
19--- a/instrumentation/events/lttng-module/compaction.h
20+++ b/instrumentation/events/lttng-module/compaction.h
21@@ -46,7 +46,7 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
22 TP_ARGS(nr_scanned, nr_taken)
23 )
24
25-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
26+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25))
27 TRACE_EVENT(mm_compaction_migratepages,
28
29 TP_PROTO(unsigned long nr_all,
30@@ -87,7 +87,7 @@ TRACE_EVENT(mm_compaction_migratepages,
31 __entry->nr_migrated,
32 __entry->nr_failed)
33 )
34-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
35+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) */
36 TRACE_EVENT(mm_compaction_migratepages,
37
38 TP_PROTO(unsigned long nr_migrated,
39--
402.1.0
41
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
index f66118011a..f9475e9d85 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb
@@ -23,6 +23,7 @@ SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \
23 file://Update-statedump-to-3.17-nsproxy-locking.patch \ 23 file://Update-statedump-to-3.17-nsproxy-locking.patch \
24 file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \ 24 file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \
25 file://fix_build_with_v3.17_kernel.patch \ 25 file://fix_build_with_v3.17_kernel.patch \
26 file://compaction-fix-mm_compaction_isolate_template-build.patch \
26 " 27 "
27 28
28export INSTALL_MOD_DIR="kernel/lttng-modules" 29export INSTALL_MOD_DIR="kernel/lttng-modules"