Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (470 commits)
  x86: Fix comments of register/stack access functions
  perf tools: Replace %m with %a in sscanf
  hw-breakpoints: Keep track of user disabled breakpoints
  tracing/syscalls: Make syscall events print callbacks static
  tracing: Add DEFINE_EVENT(), DEFINE_SINGLE_EVENT() support to docbook
  perf: Don't free perf_mmap_data until work has been done
  perf_event: Fix compile error
  perf tools: Fix _GNU_SOURCE macro related strndup() build error
  trace_syscalls: Remove unused syscall_name_to_nr()
  trace_syscalls: Simplify syscall profile
  trace_syscalls: Remove duplicate init_enter_##sname()
  trace_syscalls: Add syscall_nr field to struct syscall_metadata
  trace_syscalls: Remove enter_id exit_id
  trace_syscalls: Set event_enter_##sname->data to its metadata
  trace_syscalls: Remove unused event_syscall_enter and event_syscall_exit
  perf_event: Initialize data.period in perf_swevent_hrtimer()
  perf probe: Simplify event naming
  perf probe: Add --list option for listing current probe events
  perf probe: Add argv_split() from lib/argv_split.c
  perf probe: Move probe event utility functions to probe-event.c
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index a5b632e52fae..3839839f83c7 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -732,7 +732,7 @@ int fix_alignment(struct pt_regs *regs)
 
 #ifdef CONFIG_SPE
         if ((instr >> 26) == 0x4) {
-                PPC_WARN_EMULATED(spe);
+                PPC_WARN_ALIGNMENT(spe, regs);
                 return emulate_spe(regs, reg, instr);
         }
 #endif
@@ -786,7 +786,7 @@ int fix_alignment(struct pt_regs *regs)
                         flags |= SPLT;
                         nb = 8;
                 }
-                PPC_WARN_EMULATED(vsx);
+                PPC_WARN_ALIGNMENT(vsx, regs);
                 return emulate_vsx(addr, reg, areg, regs, flags, nb);
         }
 #endif
@@ -794,7 +794,7 @@ int fix_alignment(struct pt_regs *regs)
          * the exception of DCBZ which is handled as a special case here
          */
         if (instr == DCBZ) {
-                PPC_WARN_EMULATED(dcbz);
+                PPC_WARN_ALIGNMENT(dcbz, regs);
                 return emulate_dcbz(regs, addr);
         }
         if (unlikely(nb == 0))
@@ -804,7 +804,7 @@ int fix_alignment(struct pt_regs *regs)
          * function
          */
         if (flags & M) {
-                PPC_WARN_EMULATED(multiple);
+                PPC_WARN_ALIGNMENT(multiple, regs);
                 return emulate_multiple(regs, addr, reg, nb,
                                         flags, instr, swiz);
         }
@@ -825,11 +825,11 @@ int fix_alignment(struct pt_regs *regs)
 
         /* Special case for 16-byte FP loads and stores */
         if (nb == 16) {
-                PPC_WARN_EMULATED(fp_pair);
+                PPC_WARN_ALIGNMENT(fp_pair, regs);
                 return emulate_fp_pair(addr, reg, flags);
         }
 
-        PPC_WARN_EMULATED(unaligned);
+        PPC_WARN_ALIGNMENT(unaligned, regs);
 
         /* If we are loading, get the data from user space, else
          * get it from register values