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

Commit 651d4e6f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I0f827603,I6220ade6 into msm-4.14 

* changes:
  irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
  tracing: always define trace_{irq,preempt}_{enable_disable}
parents 5a0446e6 88766f0f

include/trace/events/preemptirq.h

+7 −4
Original line number Diff line number Diff line
@@ -56,15 +56,18 @@ DEFINE_EVENT(preemptirq_template, preempt_enable, 


#include <trace/define_trace.h>



#else /* !CONFIG_PREEMPTIRQ_EVENTS */

#endif /* !CONFIG_PREEMPTIRQ_EVENTS */



#if !defined(CONFIG_PREEMPTIRQ_EVENTS) || defined(CONFIG_PROVE_LOCKING)

#define trace_irq_enable(...)

#define trace_irq_disable(...)

#define trace_preempt_enable(...)

#define trace_preempt_disable(...)

#define trace_irq_enable_rcuidle(...)

#define trace_irq_disable_rcuidle(...)

#endif



#if !defined(CONFIG_PREEMPTIRQ_EVENTS) || !defined(CONFIG_DEBUG_PREEMPT)

#define trace_preempt_enable(...)

#define trace_preempt_disable(...)

#define trace_preempt_enable_rcuidle(...)

#define trace_preempt_disable_rcuidle(...)



#endif