Merge branch 'akpm' (patchbomb from Andrew Morton)

Merge incoming from Andrew Morton:
 - Various misc things.
 - arch/sh updates.
 - Part of ocfs2.  Review is slow.
 - Slab updates.
 - Most of -mm.
 - printk updates.
 - lib/ updates.
 - checkpatch updates.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (226 commits)
  checkpatch: update $declaration_macros, add uninitialized_var
  checkpatch: warn on missing spaces in broken up quoted
  checkpatch: fix false positives for --strict "space after cast" test
  checkpatch: fix false positive MISSING_BREAK warnings with --file
  checkpatch: add test for native c90 types in unusual order
  checkpatch: add signed generic types
  checkpatch: add short int to c variable types
  checkpatch: add for_each tests to indentation and brace tests
  checkpatch: fix brace style misuses of else and while
  checkpatch: add --fix option for a couple OPEN_BRACE misuses
  checkpatch: use the correct indentation for which()
  checkpatch: add fix_insert_line and fix_delete_line helpers
  checkpatch: add ability to insert and delete lines to patch/file
  checkpatch: add an index variable for fixed lines
  checkpatch: warn on break after goto or return with same tab indentation
  checkpatch: emit a warning on file add/move/delete
  checkpatch: add test for commit id formatting style in commit log
  checkpatch: emit fewer kmalloc_array/kcalloc conversion warnings
  checkpatch: improve "no space after cast" test
  checkpatch: allow multiple const * types
  ...

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 */