diff options
Diffstat (limited to 'kernel/rcu/tree.c')
| -rw-r--r-- | kernel/rcu/tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 321feef0f5c0..73c3cd2b87ac 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
| @@ -837,7 +837,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp, | |||
| 837 | * to the next. Only do this for the primary flavor of RCU. | 837 | * to the next. Only do this for the primary flavor of RCU. |
| 838 | */ | 838 | */ |
| 839 | if (rdp->rsp == rcu_state && | 839 | if (rdp->rsp == rcu_state && |
| 840 | ULONG_CMP_GE(ACCESS_ONCE(jiffies), rdp->rsp->jiffies_resched)) { | 840 | ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) { |
| 841 | rdp->rsp->jiffies_resched += 5; | 841 | rdp->rsp->jiffies_resched += 5; |
| 842 | resched_cpu(rdp->cpu); | 842 | resched_cpu(rdp->cpu); |
| 843 | } | 843 | } |
| @@ -847,7 +847,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp, | |||
| 847 | 847 | ||
| 848 | static void record_gp_stall_check_time(struct rcu_state *rsp) | 848 | static void record_gp_stall_check_time(struct rcu_state *rsp) |
| 849 | { | 849 | { |
| 850 | unsigned long j = ACCESS_ONCE(jiffies); | 850 | unsigned long j = jiffies; |
| 851 | unsigned long j1; | 851 | unsigned long j1; |
| 852 | 852 | ||
| 853 | rsp->gp_start = j; | 853 | rsp->gp_start = j; |
| @@ -1005,7 +1005,7 @@ static void check_cpu_stall(struct rcu_state *rsp, struct rcu_data *rdp) | |||
| 1005 | 1005 | ||
| 1006 | if (rcu_cpu_stall_suppress || !rcu_gp_in_progress(rsp)) | 1006 | if (rcu_cpu_stall_suppress || !rcu_gp_in_progress(rsp)) |
| 1007 | return; | 1007 | return; |
| 1008 | j = ACCESS_ONCE(jiffies); | 1008 | j = jiffies; |
| 1009 | 1009 | ||
| 1010 | /* | 1010 | /* |
| 1011 | * Lots of memory barriers to reject false positives. | 1011 | * Lots of memory barriers to reject false positives. |