2 files changed, 8 insertions, 9 deletions

diff --git a/include/trace/events/migrate.h b/include/trace/events/migrate.h
index 4e4f2f8b1ac2..dd2b5467d905 100644
--- a/include/trace/events/migrate.h
+++ b/include/trace/events/migrate.h
@@ -17,6 +17,7 @@
         {MR_MEMORY_HOTPLUG,     "memory_hotplug"},              \
         {MR_SYSCALL,            "syscall_or_cpuset"},           \
         {MR_MEMPOLICY_MBIND,    "mempolicy_mbind"},             \
+        {MR_NUMA_MISPLACED,     "numa_misplaced"},              \
         {MR_CMA,                "cma"}
 
 TRACE_EVENT(mm_migrate_pages,
diff --git a/include/trace/events/pagemap.h b/include/trace/events/pagemap.h
index 1c9fabde69e4..ce0803b8d05f 100644
--- 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 */