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 d069ba2d8412..92de3bacda07 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
| @@ -946,7 +946,7 @@ void rcu_irq_exit_irqson(void) | |||
| 946 | * we really have exited idle, and must do the appropriate accounting. | 946 | * we really have exited idle, and must do the appropriate accounting. |
| 947 | * The caller must have disabled interrupts. | 947 | * The caller must have disabled interrupts. |
| 948 | */ | 948 | */ |
| 949 | static void rcu_eqs_exit_common(long long newval, int user) | 949 | static void rcu_eqs_exit_common(long newval, int user) |
| 950 | { | 950 | { |
| 951 | RCU_TRACE(struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);) | 951 | RCU_TRACE(struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);) |
| 952 | 952 | ||
| @@ -979,7 +979,7 @@ static void rcu_eqs_exit_common(long long newval, int user) | |||
| 979 | static void rcu_eqs_exit(bool user) | 979 | static void rcu_eqs_exit(bool user) |
| 980 | { | 980 | { |
| 981 | struct rcu_dynticks *rdtp; | 981 | struct rcu_dynticks *rdtp; |
| 982 | long long oldval; | 982 | long oldval; |
| 983 | 983 | ||
| 984 | lockdep_assert_irqs_disabled(); | 984 | lockdep_assert_irqs_disabled(); |
| 985 | rdtp = this_cpu_ptr(&rcu_dynticks); | 985 | rdtp = this_cpu_ptr(&rcu_dynticks); |
| @@ -1043,7 +1043,7 @@ void rcu_user_exit(void) | |||
| 1043 | void rcu_nmi_enter(void) | 1043 | void rcu_nmi_enter(void) |
| 1044 | { | 1044 | { |
| 1045 | struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks); | 1045 | struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks); |
| 1046 | int incby = 2; | 1046 | long incby = 2; |
| 1047 | 1047 | ||
| 1048 | /* Complain about underflow. */ | 1048 | /* Complain about underflow. */ |
| 1049 | WARN_ON_ONCE(rdtp->dynticks_nmi_nesting < 0); | 1049 | WARN_ON_ONCE(rdtp->dynticks_nmi_nesting < 0); |
