lttng-modules: update to 2.6.1

Signed-off-by: Nicolas Thill <nico@openwrt.org>

diff --git a/devel/lttng-modules/Makefile b/devel/lttng-modules/Makefile
index 355f325035a5b88e275731a75543887001dac8ed..85b45f4d54518dcfa947fe95b52a6abdad3690eb 100644 (file)
--- a/devel/lttng-modules/Makefile
+++ b/devel/lttng-modules/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lttng-modules
-PKG_VERSION:=2.6.0
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/
-PKG_MD5SUM:=a058ab037daaca293a54934d7b9f9c98
+PKG_MD5SUM:=ccfb50ad922cdaf54a809e2d9de23da4
 
 PKG_LICENSE:=LGPL-2.1 GPL-2.0 MIT
 PKG_LICENSE_FILES:=LICENSE

diff --git a/devel/lttng-modules/patches/001-mm_page_alloc_extfrag.patch b/devel/lttng-modules/patches/001-mm_page_alloc_extfrag.patch
index 183f7d117a8be779eef0e4348cfbc265e8b04227..d8a0c62fa545ff32f036de55e6202b926deb20bf 100644 (file)
--- a/devel/lttng-modules/patches/001-mm_page_alloc_extfrag.patch
+++ b/devel/lttng-modules/patches/001-mm_page_alloc_extfrag.patch
@@ -1,98 +1,10 @@
 --- a/instrumentation/events/lttng-module/kmem.h
 +++ b/instrumentation/events/lttng-module/kmem.h
-@@ -286,7 +286,94 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(mm
-               __entry->order, __entry->migratetype)
+@@ -287,6 +287,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT(mm
  )
  
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)     \
-+      || LTTNG_KERNEL_RANGE(3,18,10, 3,19,0) \
-+      || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0))
-+
-+LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
-+
-+      TP_PROTO(struct page *page,
-+              int alloc_order, int fallback_order,
-+              int alloc_migratetype, int fallback_migratetype),
-+
-+      TP_ARGS(page,
-+              alloc_order, fallback_order,
-+              alloc_migratetype, fallback_migratetype),
-+
-+      TP_STRUCT__entry(
-+              __field_hex(    struct page *,  page                    )
-+              __field(        int,            alloc_order             )
-+              __field(        int,            fallback_order          )
-+              __field(        int,            alloc_migratetype       )
-+              __field(        int,            fallback_migratetype    )
-+              __field(        int,            change_ownership        )
-+      ),
-+
-+      TP_fast_assign(
-+              tp_assign(page, page)
-+              tp_assign(alloc_order, alloc_order)
-+              tp_assign(fallback_order, fallback_order)
-+              tp_assign(alloc_migratetype, alloc_migratetype)
-+              tp_assign(fallback_migratetype, fallback_migratetype)
-+              tp_assign(change_ownership,
-+                      (alloc_migratetype == get_pageblock_migratetype(page)))
-+      ),
-+
-+      TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
-+              __entry->page,
-+              page_to_pfn(__entry->page),
-+              __entry->alloc_order,
-+              __entry->fallback_order,
-+              pageblock_order,
-+              __entry->alloc_migratetype,
-+              __entry->fallback_migratetype,
-+              __entry->fallback_order < pageblock_order,
-+              __entry->change_ownership)
-+)
-+
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,30))
-+
-+LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
-+
-+      TP_PROTO(struct page *page,
-+              int alloc_order, int fallback_order,
-+              int alloc_migratetype, int fallback_migratetype, int new_migratetype),
-+
-+      TP_ARGS(page,
-+              alloc_order, fallback_order,
-+              alloc_migratetype, fallback_migratetype, new_migratetype),
-+
-+      TP_STRUCT__entry(
-+              __field_hex(    struct page *,  page                    )
-+              __field(        int,            alloc_order             )
-+              __field(        int,            fallback_order          )
-+              __field(        int,            alloc_migratetype       )
-+              __field(        int,            fallback_migratetype    )
-+              __field(        int,            change_ownership        )
-+      ),
-+
-+      TP_fast_assign(
-+              tp_assign(page, page)
-+              tp_assign(alloc_order, alloc_order)
-+              tp_assign(fallback_order, fallback_order)
-+              tp_assign(alloc_migratetype, alloc_migratetype)
-+              tp_assign(fallback_migratetype, fallback_migratetype)
-+              tp_assign(change_ownership, (new_migratetype == alloc_migratetype))
-+      ),
-+
-+      TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
-+              __entry->page,
-+              page_to_pfn(__entry->page),
-+              __entry->alloc_order,
-+              __entry->fallback_order,
-+              pageblock_order,
-+              __entry->alloc_migratetype,
-+              __entry->fallback_migratetype,
-+              __entry->fallback_order < pageblock_order,
-+              __entry->change_ownership)
-+)
-+
-+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
- 
- LTTNG_TRACEPOINT_EVENT(mm_page_alloc_extfrag,
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)     \
++      || LTTNG_KERNEL_RANGE(3,18,10, 3,19,0)          \
+       || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0)          \
+       || LTTNG_DEBIAN_KERNEL_RANGE(3,16,7,9,0,0, 3,17,0,0,0,0))