[PATCH] ppc64: use smp_mb and smp_wmb

Use smp_mb and smp_wmb. In particular smp_wmb is lighter weight than wmb.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/kernel/smp.c b/arch/ppc64/kernel/smp.c
index 1c92da3e4525045cbcafb779c79fc5f21784741a..3b906cd940378086b84d18f2d0b71c70a33308cc 100644 (file)
--- a/arch/ppc64/kernel/smp.c
+++ b/arch/ppc64/kernel/smp.c
@@ -125,7 +125,7 @@ void __devinit smp_generic_kick_cpu(int nr)
         * the processor will continue on to secondary_start
         */
        paca[nr].cpu_start = 1;
-       mb();
+       smp_mb();
 }
 
 #endif /* CONFIG_PPC_MULTIPLATFORM */
@@ -256,7 +256,7 @@ int smp_call_function (void (*func) (void *info), void *info, int nonatomic,
        }
 
        call_data = &data;
-       wmb();
+       smp_wmb();
        /* Send a message to all other CPUs and wait for them to respond */
        smp_ops->message_pass(MSG_ALL_BUT_SELF, PPC_MSG_CALL_FUNCTION);
 
@@ -431,7 +431,7 @@ int generic_cpu_enable(unsigned int cpu)
 
        /* get the target out of it's holding state */
        per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
-       wmb();
+       smp_wmb();
 
        while (!cpu_online(cpu))
                cpu_relax();
@@ -447,7 +447,7 @@ void generic_cpu_die(unsigned int cpu)
        int i;
 
        for (i = 0; i < 100; i++) {
-               rmb();
+               smp_rmb();
                if (per_cpu(cpu_state, cpu) == CPU_DEAD)
                        return;
                msleep(100);
@@ -463,7 +463,7 @@ void generic_mach_cpu_die(void)
        cpu = smp_processor_id();
        printk(KERN_DEBUG "CPU%d offline\n", cpu);
        __get_cpu_var(cpu_state) = CPU_DEAD;
-       wmb();
+       smp_wmb();
        while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE)
                cpu_relax();
 
@@ -515,7 +515,7 @@ int __devinit __cpu_up(unsigned int cpu)
         * be written out to main store before we release
         * the processor.
         */
-       mb();
+       smp_mb();
 
        /* wake up cpus */
        DBG("smp: kicking cpu %d\n", cpu);

diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index 77ded5a363b6d62cec0fba37ae7f01a9347c7c05..772a465b49f9c2d65636e71d27b7f4ca70f6c17f 100644 (file)
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -221,15 +221,15 @@ static __inline__ void timer_recalc_offset(unsigned long cur_tb)
        temp_varp->tb_to_xs = do_gtod.varp->tb_to_xs;
        temp_varp->tb_orig_stamp = new_tb_orig_stamp;
        temp_varp->stamp_xsec = new_stamp_xsec;
-       mb();
+       smp_mb();
        do_gtod.varp = temp_varp;
        do_gtod.var_idx = temp_idx;
 
        ++(systemcfg->tb_update_count);
-       wmb();
+       smp_wmb();
        systemcfg->tb_orig_stamp = new_tb_orig_stamp;
        systemcfg->stamp_xsec = new_stamp_xsec;
-       wmb();
+       smp_wmb();
        ++(systemcfg->tb_update_count);
 }
 
@@ -648,7 +648,7 @@ void ppc_adjtimex(void)
        temp_varp->tb_to_xs = new_tb_to_xs;
        temp_varp->stamp_xsec = new_stamp_xsec;
        temp_varp->tb_orig_stamp = do_gtod.varp->tb_orig_stamp;
-       mb();
+       smp_mb();
        do_gtod.varp = temp_varp;
        do_gtod.var_idx = temp_idx;
 
@@ -662,10 +662,10 @@ void ppc_adjtimex(void)
         * loops back and reads them again until this criteria is met.
         */
        ++(systemcfg->tb_update_count);
-       wmb();
+       smp_wmb();
        systemcfg->tb_to_xs = new_tb_to_xs;
        systemcfg->stamp_xsec = new_stamp_xsec;
-       wmb();
+       smp_wmb();
        ++(systemcfg->tb_update_count);
 
        write_sequnlock_irqrestore( &xtime_lock, flags );