@@ -691,6 +691,8 @@ static void tick_nohz_full_stop_tick(struct tick_sched *ts)
static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
{
+ unsigned int softirq;
+
/*
* If this cpu is offline and it is the one which updates
* jiffies, then give up the assignment and let it be taken by
@@ -712,13 +714,11 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
if (need_resched())
return false;
- if (unlikely(local_softirq_pending())) {
+ if (unlikely((softirq = local_softirq_pending()))) {
static int ratelimit;
- if (ratelimit < 10 &&
- (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
- pr_warn("NOHZ: local_softirq_pending %02x\n",
- (unsigned int) local_softirq_pending());
+ if (ratelimit < 10 && (softirq & SOFTIRQ_STOP_IDLE_MASK)) {
+ pr_warn("NOHZ: local_softirq_pending %02x\n", softirq);
ratelimit++;
}
return false;
can_stop_idle_tick() checks if a local softirq is pending or not, and in case it is pending we call the same routine two more times. Rather store the value in a local variable and reuse it. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- kernel/time/tick-sched.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)