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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (31 commits)
  powerpc/oprofile: fix whitespaces in op_model_cell.c
  powerpc/oprofile: IBM CELL: add SPU event profiling support
  powerpc/oprofile: fix cell/pr_util.h
  powerpc/oprofile: IBM CELL: cleanup and restructuring
  oprofile: make new cpu buffer functions part of the api
  oprofile: remove #ifdef CONFIG_OPROFILE_IBS in non-ibs code
  ring_buffer: fix ring_buffer_event_length()
  oprofile: use new data sample format for ibs
  oprofile: add op_cpu_buffer_get_data()
  oprofile: add op_cpu_buffer_add_data()
  oprofile: rework implementation of cpu buffer events
  oprofile: modify op_cpu_buffer_read_entry()
  oprofile: add op_cpu_buffer_write_reserve()
  oprofile: rename variables in add_ibs_begin()
  oprofile: rename add_sample() in cpu_buffer.c
  oprofile: rename variable ibs_allowed to has_ibs in op_model_amd.c
  oprofile: making add_sample_entry() inline
  oprofile: remove backtrace code for ibs
  oprofile: remove unused ibs macro
  oprofile: remove unused components in struct oprofile_cpu_buffer
  ...

1 files changed, 22 insertions, 0 deletions

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 17807acb05d9..21f16edf6c8d 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -132,6 +132,28 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
         oprofilefs_create_ulong(sb, root, "mmcr0", &sys.mmcr0);
         oprofilefs_create_ulong(sb, root, "mmcr1", &sys.mmcr1);
         oprofilefs_create_ulong(sb, root, "mmcra", &sys.mmcra);
+#ifdef CONFIG_OPROFILE_CELL
+        /* create a file the user tool can check to see what level of profiling
+         * support exits with this kernel. Initialize bit mask to indicate
+         * what support the kernel has:
+         * bit 0      -  Supports SPU event profiling in addition to PPU
+         *               event and cycles; and SPU cycle profiling
+         * bits 1-31  -  Currently unused.
+         *
+         * If the file does not exist, then the kernel only supports SPU
+         * cycle profiling, PPU event and cycle profiling.
+         */
+        oprofilefs_create_ulong(sb, root, "cell_support", &sys.cell_support);
+        sys.cell_support = 0x1; /* Note, the user OProfile tool must check
+                                 * that this bit is set before attempting to
+                                 * user SPU event profiling.  Older kernels
+                                 * will not have this file, hence the user
+                                 * tool is not allowed to do SPU event
+                                 * profiling on older kernels.  Older kernels
+                                 * will accept SPU events but collected data
+                                 * is garbage.
+                                 */
+#endif
 #endif
 
         for (i = 0; i < model->num_counters; ++i) {