Skip to contentSkip to conversation

sched: fix the wrong macro name of CONFIG_DEBUG_PREEMPT

PATCH In review Qiang Huang 3 participants 3 messages Apr 8, 2013 – Apr 25, 2013 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched: fix the wrong macro name of CONFIG_DEBUG_PREEMPT

Might be a typo, would cause some debug code never be run.

---
 kernel/sched/core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched/core.c +2 -2
index 30126e2..7b50412 100644
@@ -3405,7 +3405,7 @@ static noinline void __schedule_bug(struct task_struct *prev)
 	print_modules();
 	if (irqs_disabled())
 		print_irqtrace_events(prev);
-#ifdef DEBUG_PREEMPT
+#ifdef CONFIG_DEBUG_PREEMPT
 	if (in_atomic_preempt_off()) {
 		pr_err("Preemption disabled at:");
 		print_ip_sym(current->preempt_disable_ip);
@@ -7802,7 +7802,7 @@ void __might_sleep(const char *file, int line, int preempt_offset)
 	debug_show_held_locks(current);
 	if (irqs_disabled())
 		print_irqtrace_events(current);
-#ifdef DEBUG_PREEMPT
+#ifdef CONFIG_DEBUG_PREEMPT
 	if (!preempt_count_equals(preempt_offset)) {
 		pr_err("Preemption disabled at:");
 		print_ip_sym(current->preempt_disable_ip);
Signature · 1 line
1.7.1
#1 lore raw

Thomas,

Can you pick up this patch for 3.8-rt? I'll add it to stable after you have done so.

Thanks,

-- Steve

Quoted 29 lines · Qiang Huang

Might be a typo, would cause some debug code never be run.

---
 kernel/sched/core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched/core.c +2 -2
index 30126e2..7b50412 100644
@@ -3405,7 +3405,7 @@ static noinline void __schedule_bug(struct task_struct *prev)
 	print_modules();
 	if (irqs_disabled())
 		print_irqtrace_events(prev);
-#ifdef DEBUG_PREEMPT
+#ifdef CONFIG_DEBUG_PREEMPT
 	if (in_atomic_preempt_off()) {
 		pr_err("Preemption disabled at:");
 		print_ip_sym(current->preempt_disable_ip);
@@ -7802,7 +7802,7 @@ void __might_sleep(const char *file, int line, int preempt_offset)
 	debug_show_held_locks(current);
 	if (irqs_disabled())
 		print_irqtrace_events(current);
-#ifdef DEBUG_PREEMPT
+#ifdef CONFIG_DEBUG_PREEMPT
 	if (!preempt_count_equals(preempt_offset)) {
 		pr_err("Preemption disabled at:");
 		print_ip_sym(current->preempt_disable_ip);
#2 lore raw
Quoted 11 lines · * Steven Rostedt | 2013-04-09 10:37:25 [-0400]:

Thomas,

Can you pick up this patch for 3.8-rt? I'll add it to stable after you have done so.

Thanks,

-- Steve

Quoted 1 line · Qiang Huang

Might be a typo, would cause some debug code never be run.

Looks like a type, indeed. Applied.

Sebastian