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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
  trace, filters: Initialize the match variable in process_ops() properly
  trace, documentation: Fix branch profiling location in debugfs
  oprofile, s390: Cleanups
  oprofile, s390: Remove hwsampler_files.c and merge it into init.c
  perf: Fix tear-down of inherited group events
  perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds
  perf: Handle stopped state with tracepoints
  perf: Fix the software events state check
  perf, powerpc: Handle events that raise an exception without overflowing
  perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints
  perf, x86: Clean up SandyBridge PEBS events
  perf lock: Fix sorting by wait_min
  perf tools: Version incorrect with some versions of grep
  perf evlist: New command to list the names of events present in a perf.data file
  perf script: Add support for H/W and S/W events
  perf script: Add support for dumping symbols
  perf script: Support custom field selection for output
  perf script: Move printing of 'common' data from print_event and rename
  perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse
  perf script: Change process_event prototype
  ...

diff --combined arch/powerpc/include/asm/reg.h
index 1bc6a12f3725a3b87ff4bc7c0771eb129382278e,7626fa78e1f8b254cf5cf87d84829da728c1704b..7e4abebe76c0c6d342f95addba8a88e74e6ab518
--- 1/arch/powerpc/include/asm/reg.h
--- 2/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@@ -170,16 -170,6 +170,16 @@@
  #define SPEFSCR_FRMC  0x00000003      /* Embedded FP rounding mode control */
  
  /* Special Purpose Registers (SPRNs)*/
 +
 +#ifdef CONFIG_40x
 +#define SPRN_PID      0x3B1   /* Process ID */
 +#else
 +#define SPRN_PID      0x030   /* Process ID */
 +#ifdef CONFIG_BOOKE
 +#define SPRN_PID0     SPRN_PID/* Process ID Register 0 */
 +#endif
 +#endif
 +
  #define SPRN_CTR      0x009   /* Count Register */
  #define SPRN_DSCR     0x11
  #define SPRN_CTRLF    0x088
@@@ -862,8 -852,6 +862,8 @@@
  #define PVR_7450      0x80000000
  #define PVR_8540      0x80200000
  #define PVR_8560      0x80200000
 +#define PVR_VER_E500V1        0x8020
 +#define PVR_VER_E500V2        0x8021
  /*
   * For the 8xx processors, all of them report the same PVR family for
   * the PowerPC core. The various versions of these processors must be
@@@ -892,6 -880,7 +892,7 @@@
  #define PV_970                0x0039
  #define PV_POWER5     0x003A
  #define PV_POWER5p    0x003B
+ #define PV_POWER7     0x003F
  #define PV_970FX      0x003C
  #define PV_630                0x0040
  #define PV_630p       0x0041