The patch titled
Subject: mm-cma-add-trace-events-for-cma-allocations-and-freeings-fix
has been removed from the -mm tree. Its filename was
mm-cma-add-trace-events-for-cma-allocations-and-freeings-fix.patch
This patch was dropped because it was folded into mm-cma-add-trace-events-for-cma-allocations-and-freeings.patch
------------------------------------------------------
From: Stefan Strogin <stefan.strogin@xxxxxxxxx>
Subject: mm-cma-add-trace-events-for-cma-allocations-and-freeings-fix
Trace 'align' too in cma_alloc trace event.
Signed-off-by: Stefan Strogin <stefan.strogin@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Michal Nazarewicz <mpn@xxxxxxxxxx>
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
Cc: Thierry Reding <treding@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/trace/events/cma.h | 11 +++++++----
mm/cma.c | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff -puN include/trace/events/cma.h~mm-cma-add-trace-events-for-cma-allocations-and-freeings-fix include/trace/events/cma.h
--- a/include/trace/events/cma.h~mm-cma-add-trace-events-for-cma-allocations-and-freeings-fix
+++ a/include/trace/events/cma.h
@@ -10,26 +10,29 @@
TRACE_EVENT(cma_alloc,
TP_PROTO(unsigned long pfn, const struct page *page,
- unsigned int count),
+ unsigned int count, unsigned int align),
- TP_ARGS(pfn, page, count),
+ TP_ARGS(pfn, page, count, align),
TP_STRUCT__entry(
__field(unsigned long, pfn)
__field(const struct page *, page)
__field(unsigned int, count)
+ __field(unsigned int, align)
),
TP_fast_assign(
__entry->pfn = pfn;
__entry->page = page;
__entry->count = count;
+ __entry->align = align;
),
- TP_printk("pfn=%lx page=%p count=%u",
+ TP_printk("pfn=%lx page=%p count=%u align=%u",
__entry->pfn,
__entry->page,
- __entry->count)
+ __entry->count,
+ __entry->align)
);
TRACE_EVENT(cma_release,
diff -puN mm/cma.c~mm-cma-add-trace-events-for-cma-allocations-and-freeings-fix mm/cma.c
--- a/mm/cma.c~mm-cma-add-trace-events-for-cma-allocations-and-freeings-fix
+++ a/mm/cma.c
@@ -416,7 +416,7 @@ struct page *cma_alloc(struct cma *cma,
start = bitmap_no + mask + 1;
}
- trace_cma_alloc(page ? pfn : -1UL, page, count);
+ trace_cma_alloc(page ? pfn : -1UL, page, count, align);
pr_debug("%s(): returned %p\n", __func__, page);
return page;
_
Patches currently in -mm which might be from stefan.strogin@xxxxxxxxx are
mm-cma-add-trace-events-for-cma-allocations-and-freeings.patch
mm-cma-add-functions-to-get-region-pages-counters.patch
mm-cma-add-functions-to-get-region-pages-counters-fix.patch
mm-cma-add-functions-to-get-region-pages-counters-fix-2.patch
mm-cma_debugc-remove-blank-lines-before-define_simple_attribute.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
