Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 mm changes from Ingo Molnar:
 "The main change in this cycle is the rework of the TLB range flushing
  code, to simplify, fix and consolidate the code.  By Dave Hansen"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Set TLB flush tunable to sane value (33)
  x86/mm: New tunable for single vs full TLB flush
  x86/mm: Add tracepoints for TLB flushes
  x86/mm: Unify remote INVLPG code
  x86/mm: Fix missed global TLB flush stat
  x86/mm: Rip out complicated, out-of-date, buggy TLB flushing
  x86/mm: Clean up the TLB flushing code
  x86/smep: Be more informative when signalling an SMEP fault

1 files changed, 40 insertions, 0 deletions

diff --git a/include/trace/events/tlb.h b/include/trace/events/tlb.h
new file mode 100644
index 000000000000..13391d288107
--- /dev/null
+++ b/include/trace/events/tlb.h
@@ -0,0 +1,40 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM tlb
+
+#if !defined(_TRACE_TLB_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_TLB_H
+
+#include <linux/mm_types.h>
+#include <linux/tracepoint.h>
+
+#define TLB_FLUSH_REASON        \
+        { TLB_FLUSH_ON_TASK_SWITCH,     "flush on task switch" },       \
+        { TLB_REMOTE_SHOOTDOWN,         "remote shootdown" },           \
+        { TLB_LOCAL_SHOOTDOWN,          "local shootdown" },            \
+        { TLB_LOCAL_MM_SHOOTDOWN,       "local mm shootdown" }
+
+TRACE_EVENT(tlb_flush,
+
+        TP_PROTO(int reason, unsigned long pages),
+        TP_ARGS(reason, pages),
+
+        TP_STRUCT__entry(
+                __field(          int, reason)
+                __field(unsigned long,  pages)
+        ),
+
+        TP_fast_assign(
+                __entry->reason = reason;
+                __entry->pages  = pages;
+        ),
+
+        TP_printk("pages:%ld reason:%s (%d)",
+                __entry->pages,
+                __print_symbolic(__entry->reason, TLB_FLUSH_REASON),
+                __entry->reason)
+);
+
+#endif /* _TRACE_TLB_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>