Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / include / trace / events / kmem.h

diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index d0c613476620fa9da3f60220557dee19eb725c86..aece1346ceb741bf11dd0d70215a4f91e9eeba3c 100644 (file)
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -267,14 +267,12 @@ DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain,
 TRACE_EVENT(mm_page_alloc_extfrag,
 
        TP_PROTO(struct page *page,
-                       int alloc_order, int fallback_order,
-                       int alloc_migratetype, int fallback_migratetype,
-                       int change_ownership),
+               int alloc_order, int fallback_order,
+               int alloc_migratetype, int fallback_migratetype, int new_migratetype),
 
        TP_ARGS(page,
                alloc_order, fallback_order,
-               alloc_migratetype, fallback_migratetype,
-               change_ownership),
+               alloc_migratetype, fallback_migratetype, new_migratetype),
 
        TP_STRUCT__entry(
                __field(        struct page *,  page                    )
@@ -291,7 +289,7 @@ TRACE_EVENT(mm_page_alloc_extfrag,
                __entry->fallback_order         = fallback_order;
                __entry->alloc_migratetype      = alloc_migratetype;
                __entry->fallback_migratetype   = fallback_migratetype;
-               __entry->change_ownership       = change_ownership;
+               __entry->change_ownership       = (new_migratetype == alloc_migratetype);
        ),
 
        TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",