Update vmscan instrumentation to Linux 3.12

[lttng-modules.git] / instrumentation / events / lttng-module / vmscan.h

diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h
index e7a1074280fb593888b637eefb39936d218a3398..1fd50ba7c23578d322216720828184269e39e6f9 100644 (file)
--- a/instrumentation/events/lttng-module/vmscan.h
+++ b/instrumentation/events/lttng-module/vmscan.h
@@ -212,7 +212,11 @@ TRACE_EVENT(mm_shrink_slab_start,
 
        TP_fast_assign(
                tp_assign(shr,shr)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+               tp_assign(shrink, shr->scan_objects)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
                tp_assign(shrink, shr->shrink)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
                tp_assign(nr_objects_to_shrink, nr_objects_to_shrink)
                tp_assign(gfp_flags, sc->gfp_mask)
                tp_assign(pgs_scanned, pgs_scanned)
@@ -251,7 +255,11 @@ TRACE_EVENT(mm_shrink_slab_end,
 
        TP_fast_assign(
                tp_assign(shr, shr)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+               tp_assign(shrink, shr->scan_objects)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
                tp_assign(shrink, shr->shrink)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */
                tp_assign(unused_scan, unused_scan_cnt)
                tp_assign(new_scan, new_scan_cnt)
                tp_assign(retval, shrinker_retval)
@@ -529,7 +537,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_put_swap_token_template,
        TP_printk("token_mm=%p", __entry->swap_token_mm)
 )
 
-DEFINE_EVENT_MAP(put_swap_token_template, put_swap_token,
+DEFINE_EVENT_MAP(mm_vmscan_put_swap_token_template, put_swap_token,
 
        mm_vmscan_put_swap_token,
 
@@ -537,7 +545,7 @@ DEFINE_EVENT_MAP(put_swap_token_template, put_swap_token,
        TP_ARGS(swap_token_mm)
 )
 
-DEFINE_EVENT_CONDITION_MAP(put_swap_token_template, disable_swap_token,
+DEFINE_EVENT_CONDITION_MAP(mm_vmscan_put_swap_token_template, disable_swap_token,
 
        mm_vmscan_disable_swap_token,