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

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

Merge "trace/irq: sched: irq trace events should be used with !PROVE_LOCKING"

parents b62f238a e339a235

include/linux/sched/sysctl.h

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ walt_proc_update_handler(struct ctl_table *table, int write, 
#if defined(CONFIG_PREEMPT_TRACER) || defined(CONFIG_DEBUG_PREEMPT)

extern unsigned int sysctl_preemptoff_tracing_threshold_ns;

#endif

#if defined(CONFIG_PREEMPTIRQ_EVENTS) && defined(CONFIG_IRQSOFF_TRACER)

#if defined(CONFIG_PREEMPTIRQ_EVENTS) && defined(CONFIG_IRQSOFF_TRACER) && \

		!defined(CONFIG_PROVE_LOCKING)

extern unsigned int sysctl_irqsoff_tracing_threshold_ns;

#endif

kernel/sysctl.c

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ static struct ctl_table kern_table[] = { 
		.proc_handler   = proc_dointvec,

	},

#endif

#if defined(CONFIG_IRQSOFF_TRACER) && defined(CONFIG_PREEMPTIRQ_EVENTS)

#if defined(CONFIG_IRQSOFF_TRACER) && defined(CONFIG_PREEMPTIRQ_EVENTS) && \

		!defined(CONFIG_PROVE_LOCKING)

	{

		.procname       = "irqsoff_tracing_threshold_ns",

		.data           = &sysctl_irqsoff_tracing_threshold_ns,