Merge branch 'master' of /home/aia21/ntfs-2.6/

5 files changed, 9 insertions, 14 deletions

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 24dc8117b822..771a59cbd213 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -135,9 +135,8 @@ skip:
 #ifdef CONFIG_TAU_INT
                 if (tau_initialized){
                         seq_puts(p, "TAU: ");
-                        for (j = 0; j < NR_CPUS; j++)
-                                if (cpu_online(j))
-                                        seq_printf(p, "%10u ", tau_interrupts(j));
+                        for_each_online_cpu(j)
+                                seq_printf(p, "%10u ", tau_interrupts(j));
                         seq_puts(p, "  PowerPC             Thermal Assist (cpu temp)\n");
                 }
 #endif
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 258039fb3016..cb1fe5878e8b 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -81,9 +81,9 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
-        down(&kprobe_mutex);
+        mutex_lock(&kprobe_mutex);
         free_insn_slot(p->ainsn.insn);
-        up(&kprobe_mutex);
+        mutex_unlock(&kprobe_mutex);
 }
 
 static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index be12041c0fc5..c1d62bf11f29 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -162,9 +162,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 #if defined(CONFIG_SMP) && defined(CONFIG_PPC32)
                 unsigned long bogosum = 0;
                 int i;
-                for (i = 0; i < NR_CPUS; ++i)
-                        if (cpu_online(i))
-                                bogosum += loops_per_jiffy;
+                for_each_online_cpu(i)
+                        bogosum += loops_per_jiffy;
                 seq_printf(m, "total bogomips\t: %lu.%02lu\n",
                            bogosum/(500000/HZ), bogosum/(5000/HZ) % 100);
 #endif /* CONFIG_SMP && CONFIG_PPC32 */
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index db72a92943bf..dc2770df25b3 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -272,9 +272,8 @@ int __init ppc_init(void)
         if ( ppc_md.progress ) ppc_md.progress("             ", 0xffff);
 
         /* register CPU devices */
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_possible(i))
-                        register_cpu(&cpu_devices[i], i, NULL);
+        for_each_cpu(i)
+                register_cpu(&cpu_devices[i], i, NULL);
 
         /* call platform init */
         if (ppc_md.init != NULL) {
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 6d64a9bf3474..1065d87fc279 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -191,9 +191,7 @@ static void smp_psurge_message_pass(int target, int msg)
         if (num_online_cpus() < 2)
                 return;
 
-        for (i = 0; i < NR_CPUS; i++) {
-                if (!cpu_online(i))
-                        continue;
+        for_each_online_cpu(i) {
                 if (target == MSG_ALL
                     || (target == MSG_ALL_BUT_SELF && i != smp_processor_id())
                     || target == i) {