linux-rt-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] sched: fix the wrong macro name of CONFIG_DEBUG_PREEMPT
@ 2013-04-08 11:47 Qiang Huang
  2013-04-09 14:37 ` Steven Rostedt
  0 siblings, 1 reply; 3+ messages in thread
From: Qiang Huang @ 2013-04-08 11:47 UTC (permalink / raw)
  To: rostedt, Thomas Gleixner; +Cc: linux-rt-users

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

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
---
 kernel/sched/core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 30126e2..7b50412 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -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);
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] sched: fix the wrong macro name of CONFIG_DEBUG_PREEMPT
  2013-04-08 11:47 [PATCH] sched: fix the wrong macro name of CONFIG_DEBUG_PREEMPT Qiang Huang
@ 2013-04-09 14:37 ` Steven Rostedt
  2013-04-25 16:35   ` Sebastian Andrzej Siewior
  0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2013-04-09 14:37 UTC (permalink / raw)
  To: Qiang Huang; +Cc: Thomas Gleixner, linux-rt-users, stable-rt

Thomas, 

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

Thanks,

-- Steve

On Mon, 2013-04-08 at 19:47 +0800, Qiang Huang wrote:
> Might be a typo, would cause some debug code never be run.
> 
> Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
> ---
>  kernel/sched/core.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 30126e2..7b50412 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -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);



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] sched: fix the wrong macro name of CONFIG_DEBUG_PREEMPT
  2013-04-09 14:37 ` Steven Rostedt
@ 2013-04-25 16:35   ` Sebastian Andrzej Siewior
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Andrzej Siewior @ 2013-04-25 16:35 UTC (permalink / raw)
  To: Steven Rostedt; +Cc: Qiang Huang, Thomas Gleixner, linux-rt-users, stable-rt

* 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
>
>On Mon, 2013-04-08 at 19:47 +0800, Qiang Huang wrote:
>> Might be a typo, would cause some debug code never be run.

Looks like a type, indeed. Applied.

Sebastian

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-04-25 16:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-08 11:47 [PATCH] sched: fix the wrong macro name of CONFIG_DEBUG_PREEMPT Qiang Huang
2013-04-09 14:37 ` Steven Rostedt
2013-04-25 16:35   ` Sebastian Andrzej Siewior

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).