Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/tps65090' into...

[firefly-linux-kernel-4.4.55.git] / include / trace / events / pagemap.h

diff --git a/include/trace/events/pagemap.h b/include/trace/events/pagemap.h
index 1c9fabde69e4bb4aa5f13bc23a3b0d374549bbb6..ce0803b8d05f340f42116c1f129d08a645344e23 100644 (file)
--- a/include/trace/events/pagemap.h
+++ b/include/trace/events/pagemap.h
@@ -28,12 +28,10 @@ TRACE_EVENT(mm_lru_insertion,
 
        TP_PROTO(
                struct page *page,
-               unsigned long pfn,
-               int lru,
-               unsigned long flags
+               int lru
        ),
 
-       TP_ARGS(page, pfn, lru, flags),
+       TP_ARGS(page, lru),
 
        TP_STRUCT__entry(
                __field(struct page *,  page    )
@@ -44,9 +42,9 @@ TRACE_EVENT(mm_lru_insertion,
 
        TP_fast_assign(
                __entry->page   = page;
-               __entry->pfn    = pfn;
+               __entry->pfn    = page_to_pfn(page);
                __entry->lru    = lru;
-               __entry->flags  = flags;
+               __entry->flags  = trace_pagemap_flags(page);
        ),
 
        /* Flag format is based on page-types.c formatting for pagemap */
@@ -64,9 +62,9 @@ TRACE_EVENT(mm_lru_insertion,
 
 TRACE_EVENT(mm_lru_activate,
 
-       TP_PROTO(struct page *page, unsigned long pfn),
+       TP_PROTO(struct page *page),
 
-       TP_ARGS(page, pfn),
+       TP_ARGS(page),
 
        TP_STRUCT__entry(
                __field(struct page *,  page    )
@@ -75,7 +73,7 @@ TRACE_EVENT(mm_lru_activate,
 
        TP_fast_assign(
                __entry->page   = page;
-               __entry->pfn    = pfn;
+               __entry->pfn    = page_to_pfn(page);
        ),
 
        /* Flag format is based on page-types.c formatting for pagemap */