The patch titled
Subject: mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4
has been removed from the -mm tree. Its filename was
mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4.patch
This patch was dropped because it was folded into mm-compaction-enhance-tracepoint-output-for-compaction-begin-end.patch
------------------------------------------------------
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
origin.patch
sparc32-fix-broken-set_pte.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
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-fix.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-compaction-add-tracepoint-to-observe-behaviour-of-compaction-defer-v4.patch
mm-when-stealing-freepages-also-take-pages-created-by-splitting-buddy-page.patch
mm-always-steal-split-buddies-in-fallback-allocations.patch
mm-more-aggressive-page-stealing-for-unmovable-allocations.patch
mm-page_ext-remove-unnecessary-stack_trace-field.patch
mm-page_ext-remove-unnecessary-stack_trace-field-fix.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
