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, 6 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 0f0c3a9ae2e5..73560ef6f802 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -65,20 +65,20 @@ static int __init smt_setup(void)
         unsigned int cpu;
 
         if (!cpu_has_feature(CPU_FTR_SMT))
-                return 1;
+                return -ENODEV;
 
         options = find_path_device("/options");
         if (!options)
-                return 1;
+                return -ENODEV;
 
         val = (unsigned int *)get_property(options, "ibm,smt-snooze-delay",
                                            NULL);
         if (!smt_snooze_cmdline && val) {
-                for_each_cpu(cpu)
+                for_each_possible_cpu(cpu)
                         per_cpu(smt_snooze_delay, cpu) = *val;
         }
 
-        return 1;
+        return 0;
 }
 __initcall(smt_setup);
 
@@ -93,7 +93,7 @@ static int __init setup_smt_snooze_delay(char *str)
         smt_snooze_cmdline = 1;
 
         if (get_option(&str, &snooze)) {
-                for_each_cpu(cpu)
+                for_each_possible_cpu(cpu)
                         per_cpu(smt_snooze_delay, cpu) = snooze;
         }
 
@@ -347,7 +347,7 @@ static int __init topology_init(void)
 
         register_cpu_notifier(&sysfs_cpu_nb);
 
-        for_each_cpu(cpu) {
+        for_each_possible_cpu(cpu) {
                 struct cpu *c = &per_cpu(cpu_devices, cpu);
 
 #ifdef CONFIG_NUMA