Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index a81c7438d341..804f0f30f227 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -737,7 +737,7 @@ static int emulate_instruction(struct pt_regs *regs)
 
         /* Emulate the mfspr rD, PVR. */
         if ((instword & PPC_INST_MFSPR_PVR_MASK) == PPC_INST_MFSPR_PVR) {
-                PPC_WARN_EMULATED(mfpvr);
+                PPC_WARN_EMULATED(mfpvr, regs);
                 rd = (instword >> 21) & 0x1f;
                 regs->gpr[rd] = mfspr(SPRN_PVR);
                 return 0;
@@ -745,7 +745,7 @@ static int emulate_instruction(struct pt_regs *regs)
 
         /* Emulating the dcba insn is just a no-op.  */
         if ((instword & PPC_INST_DCBA_MASK) == PPC_INST_DCBA) {
-                PPC_WARN_EMULATED(dcba);
+                PPC_WARN_EMULATED(dcba, regs);
                 return 0;
         }
 
@@ -754,7 +754,7 @@ static int emulate_instruction(struct pt_regs *regs)
                 int shift = (instword >> 21) & 0x1c;
                 unsigned long msk = 0xf0000000UL >> shift;
 
-                PPC_WARN_EMULATED(mcrxr);
+                PPC_WARN_EMULATED(mcrxr, regs);
                 regs->ccr = (regs->ccr & ~msk) | ((regs->xer >> shift) & msk);
                 regs->xer &= ~0xf0000000UL;
                 return 0;
@@ -762,19 +762,19 @@ static int emulate_instruction(struct pt_regs *regs)
 
         /* Emulate load/store string insn. */
         if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) {
-                PPC_WARN_EMULATED(string);
+                PPC_WARN_EMULATED(string, regs);
                 return emulate_string_inst(regs, instword);
         }
 
         /* Emulate the popcntb (Population Count Bytes) instruction. */
         if ((instword & PPC_INST_POPCNTB_MASK) == PPC_INST_POPCNTB) {
-                PPC_WARN_EMULATED(popcntb);
+                PPC_WARN_EMULATED(popcntb, regs);
                 return emulate_popcntb_inst(regs, instword);
         }
 
         /* Emulate isel (Integer Select) instruction */
         if ((instword & PPC_INST_ISEL_MASK) == PPC_INST_ISEL) {
-                PPC_WARN_EMULATED(isel);
+                PPC_WARN_EMULATED(isel, regs);
                 return emulate_isel(regs, instword);
         }
 
@@ -973,7 +973,7 @@ void SoftwareEmulation(struct pt_regs *regs)
 #ifdef CONFIG_MATH_EMULATION
         errcode = do_mathemu(regs);
         if (errcode >= 0)
-                PPC_WARN_EMULATED(math);
+                PPC_WARN_EMULATED(math, regs);
 
         switch (errcode) {
         case 0:
@@ -996,7 +996,7 @@ void SoftwareEmulation(struct pt_regs *regs)
 #elif defined(CONFIG_8XX_MINIMAL_FPEMU)
         errcode = Soft_emulate_8xx(regs);
         if (errcode >= 0)
-                PPC_WARN_EMULATED(8xx);
+                PPC_WARN_EMULATED(8xx, regs);
 
         switch (errcode) {
         case 0:
@@ -1107,7 +1107,7 @@ void altivec_assist_exception(struct pt_regs *regs)
 
         flush_altivec_to_thread(current);
 
-        PPC_WARN_EMULATED(altivec);
+        PPC_WARN_EMULATED(altivec, regs);
         err = emulate_altivec(regs);
         if (err == 0) {
                 regs->nip += 4;         /* skip emulated instruction */