diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-12-10 03:22:59 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-06 14:13:07 +0000 |
| commit | 35857df362599becfde1b9163f6906fd3eff4ccc (patch) | |
| tree | 704a1530b8708aa0e03a34d7835c693fd64c4bae /meta/recipes-kernel | |
| parent | 015a64ea82866fd621ed4f9a946b6c5db7d8c3d7 (diff) | |
| download | openembedded-core-contrib-35857df362599becfde1b9163f6906fd3eff4ccc.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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch | 41 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb | 1 |
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 @@ +From af48c7b08de4b811d3d974e65e362b86ce8c4a34 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@windriver.com> +Date: Wed, 10 Dec 2014 03:19:28 -0500 +Subject: [PATCH] compaction: 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. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +--- + instrumentation/events/lttng-module/compaction.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h +index 22024e9ee582..07afbe06f1a6 100644 +--- a/instrumentation/events/lttng-module/compaction.h ++++ b/instrumentation/events/lttng-module/compaction.h +@@ -46,7 +46,7 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages, + 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)) + TRACE_EVENT(mm_compaction_migratepages, + + TP_PROTO(unsigned long nr_all, +@@ -87,7 +87,7 @@ TRACE_EVENT(mm_compaction_migratepages, + __entry->nr_migrated, + __entry->nr_failed) + ) +-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */ ++#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,25)) */ + TRACE_EVENT(mm_compaction_migratepages, + + TP_PROTO(unsigned long nr_migrated, +-- +2.1.0 + 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 6ff961a9b1..0f98aa571f 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.5.0.bb @@ -22,6 +22,7 @@ SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.5 \ file://Update-statedump-to-3.17-nsproxy-locking.patch \ file://Update-kvm-instrumentation-compile-on-3.17-rc1.patch \ file://fix_build_with_v3.17_kernel.patch \ + file://compaction-fix-mm_compaction_isolate_template-build.patch \ " export INSTALL_MOD_DIR="kernel/lttng-modules" |