From b371b6b2db8fab2b3c379967fd6e4b7b4715830e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 30 Dec 2014 14:25:49 -0200 Subject: lttng-modules: Update to revision to 16d7431c3 This update the source code to the 2.5.2 version and also brings two fixes from stable-2.5 branch. The update also allowed the removal of some already applied patches from the metadata. Doing this update, it fixes following build error: ,---- | make[1]: Entering directory `.../build-framebuffer/tmp/sysroots/imx23evk/usr/src/kernel' | | ERROR: Kernel configuration is invalid. | include/generated/autoconf.h or include/config/auto.conf are missing. | Run 'make oldconfig && make prepare' on kernel src to fix it. | | Building modules, stage 2. | ./scripts/Makefile.modpost:42: include/config/auto.conf: No such file or directory | make[2]: *** No rule to make target `include/config/auto.conf'. Stop. | make[1]: *** [modules] Error 2 | make[1]: Leaving directory `.../build-framebuffer/tmp/sysroots/imx23evk/usr/src/kernel' | make: *** [default] Error 2 `---- (From OE-Core rev: e575ab81f0cf145503c4afd9ce62040721a526b2) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- ...-fix-mm_compaction_isolate_template-build.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch (limited to 'meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch') 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 deleted file mode 100644 index a99871a..0000000 --- a/meta/recipes-kernel/lttng/lttng-modules/compaction-fix-mm_compaction_isolate_template-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -From af48c7b08de4b811d3d974e65e362b86ce8c4a34 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -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 ---- - 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 - -- cgit v1.1