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

Commit 1a88d11b authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: fix the compilation error with trigger backtrace call" into msm-4.9

parents e84f0411 f444a87a

include/linux/nmi.h

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static inline void hardlockup_detector_disable(void) {} 
#ifdef arch_trigger_cpumask_backtrace

static inline bool trigger_all_cpu_backtrace(void)

{

	#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)

	#if defined(CONFIG_ARM64)

		arch_trigger_all_cpu_backtrace();

	else

		arch_trigger_cpumask_backtrace(cpu_online_mask, false);
@@ -52,7 +52,7 @@ static inline bool trigger_all_cpu_backtrace(void) 


static inline bool trigger_allbutself_cpu_backtrace(void)

{

	#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)

	#if defined(CONFIG_ARM64)

		arch_trigger_all_cpu_backtrace();

	else

		arch_trigger_cpumask_backtrace(cpu_online_mask, true);