Patch "ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able" has been added to the 4.13-stable tree

This is a note to let you know that I've just added the patch titled

ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ftrace-fix-debug-preempt-config-name-in-stack_tracer_-en-dis-able.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Zev Weiss <[email protected]>
Date: Wed, 30 Aug 2017 05:36:38 -0500
Subject: ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able

From: Zev Weiss <[email protected]>

commit 60361e12d01676e23a8de89a5ef4a349ae97f616 upstream.

stack_tracer_disable()/stack_tracer_enable() had been using the wrong name for the config symbol to enable their preempt-debugging checks -- fix with a word swap.

index 6383115e9d2c..2e028854bac7 100644
@@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer);
 static inline void stack_tracer_disable(void)
 {
 	/* Preemption or interupts must be disabled */
-	if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+	if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
 		WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
 	this_cpu_inc(disable_stack_tracer);
 }

@@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void)
  */
 static inline void stack_tracer_enable(void)
 {
-	if (IS_ENABLED(CONFIG_PREEMPT_DEBUG))
+	if (IS_ENABLED(CONFIG_DEBUG_PREEMPT))
 		WARN_ON_ONCE(!preempt_count() || !irqs_disabled());
 	this_cpu_dec(disable_stack_tracer);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/ftrace-fix-debug-preempt-config-name-in-stack_tracer_-en-dis-able.patch