The patch titled Subject: mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4 has been added to the -mm tree. Its filename is mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Subject: mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4 Changes from v3: Build fix for !CONFIG_COMPACTION, !CONFIG_TRACEPOINTS Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Acked-by: Vlastimil Babka <vbabka@xxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/compaction.h | 1 - mm/compaction.c | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff -puN include/linux/compaction.h~mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4 include/linux/compaction.h --- a/include/linux/compaction.h~mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4 +++ a/include/linux/compaction.h @@ -25,7 +25,6 @@ struct alloc_context; /* in mm/internal.h */ #ifdef CONFIG_COMPACTION -extern char *compaction_status_string[]; extern int sysctl_compact_memory; extern int sysctl_compaction_handler(struct ctl_table *table, int write, void __user *buffer, size_t *length, loff_t *ppos); diff -puN mm/compaction.c~mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4 mm/compaction.c --- a/mm/compaction.c~mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4 +++ a/mm/compaction.c @@ -19,14 +19,6 @@ #include "internal.h" #ifdef CONFIG_COMPACTION -char *compaction_status_string[] = { - "deferred", - "skipped", - "continue", - "partial", - "complete", -}; - static inline void count_compact_event(enum vm_event_item item) { count_vm_event(item); @@ -42,6 +34,15 @@ static inline void count_compact_events( #endif #if defined CONFIG_COMPACTION || defined CONFIG_CMA +#ifdef CONFIG_TRACEPOINTS +static const char const *compaction_status_string[] = { + "deferred", + "skipped", + "continue", + "partial", + "complete", +}; +#endif #define CREATE_TRACE_POINTS #include <trace/events/compaction.h> _ Patches currently in -mm which might be from iamjoonsoo.kim@xxxxxxx are mm-slub-optimize-alloc-free-fastpath-by-removing-preemption-on-off.patch mm-slub-optimize-alloc-free-fastpath-by-removing-preemption-on-off-v3.patch mm-dont-use-compound_head-in-virt_to_head_page.patch mm-dont-use-compound_head-in-virt_to_head_page-v3.patch mm-vmstatc-fix-cleanup-ifdefs.patch mm-vmstatc-fix-cleanup-ifdefs-fix.patch mm-set-page-pfmemalloc-in-prep_new_page.patch mm-page_alloc-reduce-number-of-alloc_pages-functions-parameters.patch mm-reduce-try_to_compact_pages-parameters.patch mm-microoptimize-zonelist-operations.patch list_lru-introduce-list_lru_shrink_countwalk.patch fs-consolidate-nrfree_cached_objects-args-in-shrink_control.patch vmscan-per-memory-cgroup-slab-shrinkers.patch memcg-rename-some-cache-id-related-variables.patch memcg-add-rwsem-to-synchronize-against-memcg_caches-arrays-relocation.patch list_lru-get-rid-of-active_nodes.patch list_lru-organize-all-list_lrus-to-list.patch list_lru-introduce-per-memcg-lists.patch fs-make-shrinker-memcg-aware.patch mm-cma-fix-totalcma_pages-to-include-dt-defined-cma-regions.patch mm-compaction-change-tracepoint-format-from-decimal-to-hexadecimal.patch mm-compaction-enhance-tracepoint-output-for-compaction-begin-end.patch mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4.patch mm-compaction-print-current-range-where-compaction-work.patch mm-compaction-more-trace-to-understand-when-why-compaction-start-finish.patch mm-compaction-add-tracepoint-to-observe-behaviour-of-compaction-defer.patch mm-util-add-kstrdup_const.patch kernfs-convert-node-name-allocation-to-kstrdup_const.patch clk-convert-clock-name-allocations-to-kstrdup_const.patch mm-slab-convert-cache-name-allocations-to-kstrdup_const.patch mm-slab-convert-cache-name-allocations-to-kstrdup_const-fix.patch fs-namespace-convert-devname-allocation-to-kstrdup_const.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html