Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b776547b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: core: reset preemption/irqsoff disable timestamp"

parents 59f2cfc8 5e3f09ce

kernel/sched/core.c

+1 −0
Original line number Diff line number Diff line
@@ -3447,6 +3447,7 @@ static inline void preempt_latency_stop(int val) 
			trace_sched_preempt_disable(delta, ps->irqs_disabled,

						ps->caddr[0], ps->caddr[1],

						ps->caddr[2], ps->caddr[3]);

		ps->ts = 0;

		trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip());

	}

}

kernel/trace/trace_irqsoff.c

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ void tracer_hardirqs_on(unsigned long a0, unsigned long a1) 
			delta > sysctl_irqsoff_tracing_threshold_ns)

		trace_irqs_disable(delta, is->caddr[0], is->caddr[1],

						is->caddr[2], is->caddr[3]);

	is->ts = 0;

	lockdep_on();

#endif /* CONFIG_PREEMPTIRQ_EVENTS */