diff options
Diffstat (limited to 'arch/ppc64/kernel/time.c')
| -rw-r--r-- | arch/ppc64/kernel/time.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 77ded5a363b6..772a465b49f9 100644 --- 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) | |||
| 221 | temp_varp->tb_to_xs = do_gtod.varp->tb_to_xs; | 221 | temp_varp->tb_to_xs = do_gtod.varp->tb_to_xs; |
| 222 | temp_varp->tb_orig_stamp = new_tb_orig_stamp; | 222 | temp_varp->tb_orig_stamp = new_tb_orig_stamp; |
| 223 | temp_varp->stamp_xsec = new_stamp_xsec; | 223 | temp_varp->stamp_xsec = new_stamp_xsec; |
| 224 | mb(); | 224 | smp_mb(); |
| 225 | do_gtod.varp = temp_varp; | 225 | do_gtod.varp = temp_varp; |
| 226 | do_gtod.var_idx = temp_idx; | 226 | do_gtod.var_idx = temp_idx; |
| 227 | 227 | ||
| 228 | ++(systemcfg->tb_update_count); | 228 | ++(systemcfg->tb_update_count); |
| 229 | wmb(); | 229 | smp_wmb(); |
| 230 | systemcfg->tb_orig_stamp = new_tb_orig_stamp; | 230 | systemcfg->tb_orig_stamp = new_tb_orig_stamp; |
| 231 | systemcfg->stamp_xsec = new_stamp_xsec; | 231 | systemcfg->stamp_xsec = new_stamp_xsec; |
| 232 | wmb(); | 232 | smp_wmb(); |
| 233 | ++(systemcfg->tb_update_count); | 233 | ++(systemcfg->tb_update_count); |
| 234 | } | 234 | } |
| 235 | 235 | ||
| @@ -648,7 +648,7 @@ void ppc_adjtimex(void) | |||
| 648 | temp_varp->tb_to_xs = new_tb_to_xs; | 648 | temp_varp->tb_to_xs = new_tb_to_xs; |
| 649 | temp_varp->stamp_xsec = new_stamp_xsec; | 649 | temp_varp->stamp_xsec = new_stamp_xsec; |
| 650 | temp_varp->tb_orig_stamp = do_gtod.varp->tb_orig_stamp; | 650 | temp_varp->tb_orig_stamp = do_gtod.varp->tb_orig_stamp; |
| 651 | mb(); | 651 | smp_mb(); |
| 652 | do_gtod.varp = temp_varp; | 652 | do_gtod.varp = temp_varp; |
| 653 | do_gtod.var_idx = temp_idx; | 653 | do_gtod.var_idx = temp_idx; |
| 654 | 654 | ||
| @@ -662,10 +662,10 @@ void ppc_adjtimex(void) | |||
| 662 | * loops back and reads them again until this criteria is met. | 662 | * loops back and reads them again until this criteria is met. |
| 663 | */ | 663 | */ |
| 664 | ++(systemcfg->tb_update_count); | 664 | ++(systemcfg->tb_update_count); |
| 665 | wmb(); | 665 | smp_wmb(); |
| 666 | systemcfg->tb_to_xs = new_tb_to_xs; | 666 | systemcfg->tb_to_xs = new_tb_to_xs; |
| 667 | systemcfg->stamp_xsec = new_stamp_xsec; | 667 | systemcfg->stamp_xsec = new_stamp_xsec; |
| 668 | wmb(); | 668 | smp_wmb(); |
| 669 | ++(systemcfg->tb_update_count); | 669 | ++(systemcfg->tb_update_count); |
| 670 | 670 | ||
| 671 | write_sequnlock_irqrestore( &xtime_lock, flags ); | 671 | write_sequnlock_irqrestore( &xtime_lock, flags ); |
