diff options
| -rw-r--r-- | kernel/rcutree_plugin.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index eb8dcd1bc4b5..cb5879386a02 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
| @@ -677,7 +677,7 @@ void synchronize_rcu(void) | |||
| 677 | EXPORT_SYMBOL_GPL(synchronize_rcu); | 677 | EXPORT_SYMBOL_GPL(synchronize_rcu); |
| 678 | 678 | ||
| 679 | static DECLARE_WAIT_QUEUE_HEAD(sync_rcu_preempt_exp_wq); | 679 | static DECLARE_WAIT_QUEUE_HEAD(sync_rcu_preempt_exp_wq); |
| 680 | static long sync_rcu_preempt_exp_count; | 680 | static unsigned long sync_rcu_preempt_exp_count; |
| 681 | static DEFINE_MUTEX(sync_rcu_preempt_exp_mutex); | 681 | static DEFINE_MUTEX(sync_rcu_preempt_exp_mutex); |
| 682 | 682 | ||
| 683 | /* | 683 | /* |
| @@ -792,7 +792,7 @@ void synchronize_rcu_expedited(void) | |||
| 792 | unsigned long flags; | 792 | unsigned long flags; |
| 793 | struct rcu_node *rnp; | 793 | struct rcu_node *rnp; |
| 794 | struct rcu_state *rsp = &rcu_preempt_state; | 794 | struct rcu_state *rsp = &rcu_preempt_state; |
| 795 | long snap; | 795 | unsigned long snap; |
| 796 | int trycount = 0; | 796 | int trycount = 0; |
| 797 | 797 | ||
| 798 | smp_mb(); /* Caller's modifications seen first by other CPUs. */ | 798 | smp_mb(); /* Caller's modifications seen first by other CPUs. */ |
| @@ -811,10 +811,10 @@ void synchronize_rcu_expedited(void) | |||
| 811 | synchronize_rcu(); | 811 | synchronize_rcu(); |
| 812 | return; | 812 | return; |
| 813 | } | 813 | } |
| 814 | if ((ACCESS_ONCE(sync_rcu_preempt_exp_count) - snap) > 0) | 814 | if (ULONG_CMP_LT(snap, ACCESS_ONCE(sync_rcu_preempt_exp_count))) |
| 815 | goto mb_ret; /* Others did our work for us. */ | 815 | goto mb_ret; /* Others did our work for us. */ |
| 816 | } | 816 | } |
| 817 | if ((ACCESS_ONCE(sync_rcu_preempt_exp_count) - snap) > 0) | 817 | if (ULONG_CMP_LT(snap, ACCESS_ONCE(sync_rcu_preempt_exp_count))) |
| 818 | goto unlock_mb_ret; /* Others did our work for us. */ | 818 | goto unlock_mb_ret; /* Others did our work for us. */ |
| 819 | 819 | ||
| 820 | /* force all RCU readers onto ->blkd_tasks lists. */ | 820 | /* force all RCU readers onto ->blkd_tasks lists. */ |
