This patch changes trace_zsmalloc_compact_start[end] to trace_zs_compact_start[end] to keep function naming consistent with others in zsmalloc Also this patch remove pages_total_compacted information which may not really needed. Signed-off-by: Ganesh Mahendran <opensource.ganesh@xxxxxxxxx> --- v2: change commit message --- include/trace/events/zsmalloc.h | 16 ++++++---------- mm/zsmalloc.c | 7 +++---- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/include/trace/events/zsmalloc.h b/include/trace/events/zsmalloc.h index 3b6f14e..c7a39f4 100644 --- a/include/trace/events/zsmalloc.h +++ b/include/trace/events/zsmalloc.h @@ -7,7 +7,7 @@ #include <linux/types.h> #include <linux/tracepoint.h> -TRACE_EVENT(zsmalloc_compact_start, +TRACE_EVENT(zs_compact_start, TP_PROTO(const char *pool_name), @@ -25,29 +25,25 @@ TRACE_EVENT(zsmalloc_compact_start, __entry->pool_name) ); -TRACE_EVENT(zsmalloc_compact_end, +TRACE_EVENT(zs_compact_end, - TP_PROTO(const char *pool_name, unsigned long pages_compacted, - unsigned long pages_total_compacted), + TP_PROTO(const char *pool_name, unsigned long pages_compacted), - TP_ARGS(pool_name, pages_compacted, pages_total_compacted), + TP_ARGS(pool_name, pages_compacted), TP_STRUCT__entry( __field(const char *, pool_name) __field(unsigned long, pages_compacted) - __field(unsigned long, pages_total_compacted) ), TP_fast_assign( __entry->pool_name = pool_name; __entry->pages_compacted = pages_compacted; - __entry->pages_total_compacted = pages_total_compacted; ), - TP_printk("pool %s: %ld pages compacted(total %ld)", + TP_printk("pool %s: %ld pages compacted", __entry->pool_name, - __entry->pages_compacted, - __entry->pages_total_compacted) + __entry->pages_compacted) ); #endif /* _TRACE_ZSMALLOC_H */ diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index e425de4..c7f79d5 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -2323,7 +2323,7 @@ unsigned long zs_compact(struct zs_pool *pool) struct size_class *class; unsigned long pages_compacted_before = pool->stats.pages_compacted; - trace_zsmalloc_compact_start(pool->name); + trace_zs_compact_start(pool->name); for (i = zs_size_classes - 1; i >= 0; i--) { class = pool->size_class[i]; @@ -2334,9 +2334,8 @@ unsigned long zs_compact(struct zs_pool *pool) __zs_compact(pool, class); } - trace_zsmalloc_compact_end(pool->name, - pool->stats.pages_compacted - pages_compacted_before, - pool->stats.pages_compacted); + trace_zs_compact_end(pool->name, + pool->stats.pages_compacted - pages_compacted_before); return pool->stats.pages_compacted; } -- 1.9.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>