Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6

* 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6: (37 commits)
  [CELL] spufs: rework list management and associated locking
  [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs
  [CELL] oprofile: enable SPU switch notification to detect currently active SPU tasks
  [CELL] spu_base: locking cleanup
  [CELL] cell: indexing of SPUs based on firmware vicinity properties
  [CELL] spufs: integration of SPE affinity with the scheduller
  [CELL] cell: add placement computation for scheduling of affinity contexts
  [CELL] spufs: extension of spu_create to support affinity definition
  [CELL] cell: add hardcoded spu vicinity information for QS20
  [CELL] cell: add vicinity information on spus
  [CELL] cell: add per BE structure with info about its SPUs
  [CELL] spufs: use find_first_bit() instead of sched_find_first_bit()
  [CELL] spufs: remove unused file argument from spufs_run_spu()
  [CELL] spufs: change decrementer restore timing
  [CELL] spufs: dont halt decrementer at restore step 47
  [CELL] spufs: limit saving MFC_CNTL bits
  [CELL] spufs: fix read and write for decr_status file
  [CELL] spufs: fix decr_status meanings
  [CELL] spufs: remove needless context save/restore code
  [CELL] spufs: fix array size of channel index
  ...

1 files changed, 42 insertions, 9 deletions

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 1a7ef7e246d2..a28cce1d6c24 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -29,6 +29,8 @@ static struct op_powerpc_model *model;
 static struct op_counter_config ctr[OP_MAX_COUNTER];
 static struct op_system_config sys;
 
+static int op_per_cpu_rc;
+
 static void op_handle_interrupt(struct pt_regs *regs)
 {
         model->handle_interrupt(regs, ctr);
@@ -36,25 +38,41 @@ static void op_handle_interrupt(struct pt_regs *regs)
 
 static void op_powerpc_cpu_setup(void *dummy)
 {
-        model->cpu_setup(ctr);
+        int ret;
+
+        ret = model->cpu_setup(ctr);
+
+        if (ret != 0)
+                op_per_cpu_rc = ret;
 }
 
 static int op_powerpc_setup(void)
 {
         int err;
 
+        op_per_cpu_rc = 0;
+
         /* Grab the hardware */
         err = reserve_pmc_hardware(op_handle_interrupt);
         if (err)
                 return err;
 
         /* Pre-compute the values to stuff in the hardware registers.  */
-        model->reg_setup(ctr, &sys, model->num_counters);
+        op_per_cpu_rc = model->reg_setup(ctr, &sys, model->num_counters);
 
-        /* Configure the registers on all cpus.  */
+        if (op_per_cpu_rc)
+                goto out;
+
+        /* Configure the registers on all cpus.  If an error occurs on one
+         * of the cpus, op_per_cpu_rc will be set to the error */
         on_each_cpu(op_powerpc_cpu_setup, NULL, 0, 1);
 
-        return 0;
+out:    if (op_per_cpu_rc) {
+                /* error on setup release the performance counter hardware */
+                release_pmc_hardware();
+        }
+
+        return op_per_cpu_rc;
 }
 
 static void op_powerpc_shutdown(void)
@@ -64,16 +82,29 @@ static void op_powerpc_shutdown(void)
 
 static void op_powerpc_cpu_start(void *dummy)
 {
-        model->start(ctr);
+        /* If any of the cpus have return an error, set the
+         * global flag to the error so it can be returned
+         * to the generic OProfile caller.
+         */
+        int ret;
+
+        ret = model->start(ctr);
+        if (ret != 0)
+                op_per_cpu_rc = ret;
 }
 
 static int op_powerpc_start(void)
 {
+        op_per_cpu_rc = 0;
+
         if (model->global_start)
-                model->global_start(ctr);
-        if (model->start)
+                return model->global_start(ctr);
+        if (model->start) {
                 on_each_cpu(op_powerpc_cpu_start, NULL, 0, 1);
-        return 0;
+                return op_per_cpu_rc;
+        }
+        return -EIO; /* No start function is defined for this
+                        power architecture */
 }
 
 static inline void op_powerpc_cpu_stop(void *dummy)
@@ -147,11 +178,13 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
         switch (cur_cpu_spec->oprofile_type) {
 #ifdef CONFIG_PPC64
-#ifdef CONFIG_PPC_CELL_NATIVE
+#ifdef CONFIG_OPROFILE_CELL
                 case PPC_OPROFILE_CELL:
                         if (firmware_has_feature(FW_FEATURE_LPAR))
                                 return -ENODEV;
                         model = &op_model_cell;
+                        ops->sync_start = model->sync_start;
+                        ops->sync_stop = model->sync_stop;
                         break;
 #endif
                 case PPC_OPROFILE_RS64: