From: Mathieu Desnoyers Date: Thu, 31 Oct 2013 14:20:52 +0000 (-0400) Subject: Update vmscan instrumentation to Linux 3.12 X-Git-Tag: v2.4.0-rc1~4 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5465fedd5ec3b3d510767667d7810edca9d7ca5a;p=lttng-modules.git Update vmscan instrumentation to Linux 3.12 Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h index 75a66858..1fd50ba7 100644 --- 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)