Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (67 commits)
  [PATCH] powerpc: Remove oprofile spinlock backtrace code
  [PATCH] powerpc: Add oprofile calltrace support to all powerpc cpus
  [PATCH] powerpc: Add oprofile calltrace support
  [PATCH] for_each_possible_cpu: ppc
  [PATCH] for_each_possible_cpu: powerpc
  [PATCH] lock PTE before updating it in 440/BookE page fault handler
  [PATCH] powerpc: Kill _machine and hard-coded platform numbers
  ppc: Fix compile error in arch/ppc/lib/strcase.c
  [PATCH] git-powerpc: WARN was a dumb idea
  [PATCH] powerpc: a couple of trivial compile warning fixes
  powerpc: remove OCP references
  powerpc: Make uImage default build output for MPC8540 ADS
  powerpc: move math-emu over to arch/powerpc
  powerpc: use memparse() for mem= command line parsing
  ppc: fix strncasecmp prototype
  [PATCH] powerpc: make ISA floppies work again
  [PATCH] powerpc: Fix some initcall return values
  [PATCH] powerpc: Workaround for pSeries RTAS bug
  [PATCH] spufs: fix __init/__exit annotations
  [PATCH] powerpc: add hvc backend for rtas
  ...

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index cc2535be3a73..5b1de7e8041e 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -117,18 +117,10 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
 
         oprofilefs_create_ulong(sb, root, "enable_kernel", &sys.enable_kernel);
         oprofilefs_create_ulong(sb, root, "enable_user", &sys.enable_user);
-#ifdef CONFIG_PPC64
-        oprofilefs_create_ulong(sb, root, "backtrace_spinlocks",
-                                &sys.backtrace_spinlocks);
-#endif
 
         /* Default to tracing both kernel and user */
         sys.enable_kernel = 1;
         sys.enable_user = 1;
-#ifdef CONFIG_PPC64
-        /* Turn on backtracing through spinlocks by default */
-        sys.backtrace_spinlocks = 1;
-#endif
 
         return 0;
 }
@@ -168,6 +160,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         ops->shutdown = op_powerpc_shutdown;
         ops->start = op_powerpc_start;
         ops->stop = op_powerpc_stop;
+        ops->backtrace = op_powerpc_backtrace;
 
         printk(KERN_INFO "oprofile: using %s performance monitoring.\n",
                ops->cpu_type);