---

yaml
---
r: 211991
b: refs/heads/master
c: d267f87
h: refs/heads/master
i:
  211989: 966eaa6
  211987: 5a2a35e
  211983: dcee195
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa483808516ca5cacfa0e5849691f64fec25828e
+refs/heads/master: d267f87fb8179c6dba03d08b91952e81bc3723c7

trunk/kernel/sched.c

@@ -1974,8 +1974,8 @@ void account_system_vtime(struct task_struct *curr)
 
 	local_irq_save(flags);
 
-	now = sched_clock();
 	cpu = smp_processor_id();
+	now = sched_clock_cpu(cpu);
 	delta = now - per_cpu(irq_start_time, cpu);
 	per_cpu(irq_start_time, cpu) = now;
 	/*

trunk/kernel/softirq.c

@@ -296,10 +296,16 @@ void irq_enter(void)
 
 	rcu_irq_enter();
 	if (idle_cpu(cpu) && !in_interrupt()) {
-		__irq_enter();
+		/*
+		 * Prevent raise_softirq from needlessly waking up ksoftirqd
+		 * here, as softirq will be serviced on return from interrupt.
+		 */
+		local_bh_disable();
 		tick_check_idle(cpu);
-	} else
-		__irq_enter();
+		_local_bh_enable();
+	}
+
+	__irq_enter();
 }
 
 #ifdef __ARCH_IRQ_EXIT_IRQS_DISABLED