diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch | 41 |
1 files changed, 41 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 @@ | |||
1 | From af48c7b08de4b811d3d974e65e362b86ce8c4a34 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Wed, 10 Dec 2014 03:19:28 -0500 | ||
4 | Subject: [PATCH] compaction: fix mm_compaction_isolate_template build | ||
5 | |||
6 | linux-stable integrated the 3.16 commit f8c9301fa5a2a [mm/compaction: do | ||
7 | not count migratepages when unnecessary] with the 3.14.25 update. | ||
8 | |||
9 | So we have to update the lttng-module linux version codes to use the | ||
10 | new definition in builds greater than 3.14.24 or 3.16. | ||
11 | |||
12 | Signed-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 | |||
17 | diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h | ||
18 | index 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 | -- | ||
40 | 2.1.0 | ||
41 | |||