Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 17 insertions, 2 deletions

diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h
index 9154e852673..f0fb4fc1f6e 100644
--- a/arch/powerpc/include/asm/emulated_ops.h
+++ b/arch/powerpc/include/asm/emulated_ops.h
@@ -19,6 +19,7 @@
 #define _ASM_POWERPC_EMULATED_OPS_H
 
 #include <asm/atomic.h>
+#include <linux/perf_event.h>
 
 
 #ifdef CONFIG_PPC_EMULATED_STATS
@@ -57,7 +58,7 @@ extern u32 ppc_warn_emulated;
 
 extern void ppc_warn_emulated_print(const char *type);
 
-#define PPC_WARN_EMULATED(type)                                          \
+#define __PPC_WARN_EMULATED(type)                                        \
         do {                                                             \
                 atomic_inc(&ppc_emulated.type.val);                      \
                 if (ppc_warn_emulated)                                   \
@@ -66,8 +67,22 @@ extern void ppc_warn_emulated_print(const char *type);
 
 #else /* !CONFIG_PPC_EMULATED_STATS */
 
-#define PPC_WARN_EMULATED(type) do { } while (0)
+#define __PPC_WARN_EMULATED(type)       do { } while (0)
 
 #endif /* !CONFIG_PPC_EMULATED_STATS */
 
+#define PPC_WARN_EMULATED(type, regs)                                   \
+        do {                                                            \
+                perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS,           \
+                        1, 0, regs, 0);                                 \
+                __PPC_WARN_EMULATED(type);                              \
+        } while (0)
+
+#define PPC_WARN_ALIGNMENT(type, regs)                                  \
+        do {                                                            \
+                perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS,           \
+                        1, 0, regs, regs->dar);                         \
+                __PPC_WARN_EMULATED(type);                              \
+        } while (0)
+
 #endif /* _ASM_POWERPC_EMULATED_OPS_H */