* [PATCH 0/2] [rt-kernel]
@ 2010-03-24 17:35 John Kacur
2010-03-24 17:35 ` [PATCH 1/2] Revert "rt: trivial fix to REMINDER block in init/main.c" John Kacur
2010-03-24 17:35 ` [PATCH 2/2] rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT John Kacur
0 siblings, 2 replies; 6+ messages in thread
From: John Kacur @ 2010-03-24 17:35 UTC (permalink / raw)
To: Thomas Gleixner
Cc: lkml, rt-users, John Kacur, Clark Williams, Steven Rostedt
These are two trivial rt-kernel patches to fix up an unnecessary warning.
John Kacur (2):
Revert "rt: trivial fix to REMINDER block in init/main.c"
rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT
init/main.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] Revert "rt: trivial fix to REMINDER block in init/main.c"
2010-03-24 17:35 [PATCH 0/2] [rt-kernel] John Kacur
@ 2010-03-24 17:35 ` John Kacur
2010-03-24 18:13 ` Steven Rostedt
2010-03-24 17:35 ` [PATCH 2/2] rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT John Kacur
1 sibling, 1 reply; 6+ messages in thread
From: John Kacur @ 2010-03-24 17:35 UTC (permalink / raw)
To: Thomas Gleixner
Cc: lkml, rt-users, John Kacur, Clark Williams, Steven Rostedt
This reverts commit 3e39399ef4a742d994570488994be93ef17d4ef5.
CONFIG_STACK_TRACER really should not be in the reminder block.
By default it is not enabled, and has negligible impact.
Signed-off-by: John Kacur <jkacur@redhat.com>
---
init/main.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/init/main.c b/init/main.c
index 48393c0..aa48b7b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -928,9 +928,6 @@ static int __init kernel_init(void * unused)
#ifdef CONFIG_PREEMPT_TRACER
printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n");
#endif
-#ifdef CONFIG_STACK_TRACER
- printk(KERN_ERR "* CONFIG_STACK_TRACER *\n");
-#endif
#if defined(CONFIG_FTRACE) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
printk(KERN_ERR "* CONFIG_FTRACE *\n");
#endif
--
1.6.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Revert "rt: trivial fix to REMINDER block in init/main.c"
2010-03-24 17:35 ` [PATCH 1/2] Revert "rt: trivial fix to REMINDER block in init/main.c" John Kacur
@ 2010-03-24 18:13 ` Steven Rostedt
0 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2010-03-24 18:13 UTC (permalink / raw)
To: John Kacur; +Cc: Thomas Gleixner, lkml, rt-users, Clark Williams
On Wed, 2010-03-24 at 18:35 +0100, John Kacur wrote:
> This reverts commit 3e39399ef4a742d994570488994be93ef17d4ef5.
>
> CONFIG_STACK_TRACER really should not be in the reminder block.
> By default it is not enabled, and has negligible impact.
Correct, the stack trace is based off of the function tracer, which with
dynamic ftrace it does not have any extra impact when not enabled.
Hmm, maybe we should add a warning if it was set on the command line?
Anyway,
Acked-by: Steven Rostedt <rostedt@goodmis.org>
-- Steve
>
> Signed-off-by: John Kacur <jkacur@redhat.com>
> ---
> init/main.c | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/init/main.c b/init/main.c
> index 48393c0..aa48b7b 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -928,9 +928,6 @@ static int __init kernel_init(void * unused)
> #ifdef CONFIG_PREEMPT_TRACER
> printk(KERN_ERR "* CONFIG_PREEMPT_TRACER *\n");
> #endif
> -#ifdef CONFIG_STACK_TRACER
> - printk(KERN_ERR "* CONFIG_STACK_TRACER *\n");
> -#endif
> #if defined(CONFIG_FTRACE) && !defined(CONFIG_FTRACE_MCOUNT_RECORD)
> printk(KERN_ERR "* CONFIG_FTRACE *\n");
> #endif
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT
2010-03-24 17:35 [PATCH 0/2] [rt-kernel] John Kacur
2010-03-24 17:35 ` [PATCH 1/2] Revert "rt: trivial fix to REMINDER block in init/main.c" John Kacur
@ 2010-03-24 17:35 ` John Kacur
2010-03-24 18:13 ` Steven Rostedt
1 sibling, 1 reply; 6+ messages in thread
From: John Kacur @ 2010-03-24 17:35 UTC (permalink / raw)
To: Thomas Gleixner
Cc: lkml, rt-users, John Kacur, Clark Williams, Steven Rostedt
Remove CONFIG_STACK_TRACER from DEBUG_COUNT so that reminder messages
are printed correctly, and don't leave an empty reminder block for example.
Signed-off-by: John Kacur <jkacur@redhat.com>
---
init/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/init/main.c b/init/main.c
index aa48b7b..17fd973 100644
--- a/init/main.c
+++ b/init/main.c
@@ -908,7 +908,7 @@ static int __init kernel_init(void * unused)
WARN_ON(irqs_disabled());
#endif
-#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + defined(CONFIG_STACK_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
+#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
#if DEBUG_COUNT > 0
printk(KERN_ERR "*****************************************************************************\n");
--
1.6.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT
2010-03-24 17:35 ` [PATCH 2/2] rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT John Kacur
@ 2010-03-24 18:13 ` Steven Rostedt
2010-03-24 19:27 ` John Kacur
0 siblings, 1 reply; 6+ messages in thread
From: Steven Rostedt @ 2010-03-24 18:13 UTC (permalink / raw)
To: John Kacur; +Cc: Thomas Gleixner, lkml, rt-users, Clark Williams
On Wed, 2010-03-24 at 18:35 +0100, John Kacur wrote:
> Remove CONFIG_STACK_TRACER from DEBUG_COUNT so that reminder messages
> are printed correctly, and don't leave an empty reminder block for example.
>
I think this should be attached to patch 1. Why have two patches for
this?
-- Steve
> Signed-off-by: John Kacur <jkacur@redhat.com>
> ---
> init/main.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/init/main.c b/init/main.c
> index aa48b7b..17fd973 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -908,7 +908,7 @@ static int __init kernel_init(void * unused)
> WARN_ON(irqs_disabled());
> #endif
>
> -#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + defined(CONFIG_STACK_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
> +#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) + defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST) + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
>
> #if DEBUG_COUNT > 0
> printk(KERN_ERR "*****************************************************************************\n");
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT
2010-03-24 18:13 ` Steven Rostedt
@ 2010-03-24 19:27 ` John Kacur
0 siblings, 0 replies; 6+ messages in thread
From: John Kacur @ 2010-03-24 19:27 UTC (permalink / raw)
To: rostedt; +Cc: Thomas Gleixner, lkml, rt-users, Clark Williams
----- "Steven Rostedt" <rostedt@goodmis.org> wrote:
> On Wed, 2010-03-24 at 18:35 +0100, John Kacur wrote:
> > Remove CONFIG_STACK_TRACER from DEBUG_COUNT so that reminder
> messages
> > are printed correctly, and don't leave an empty reminder block for
> example.
> >
>
> I think this should be attached to patch 1. Why have two patches for
> this?
Because patch 1 is a revert, I thought this makes the git history cleaner.
John
>
> -- Steve
>
> > Signed-off-by: John Kacur <jkacur@redhat.com>
> > ---
> > init/main.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/init/main.c b/init/main.c
> > index aa48b7b..17fd973 100644
> > --- a/init/main.c
> > +++ b/init/main.c
> > @@ -908,7 +908,7 @@ static int __init kernel_init(void * unused)
> > WARN_ON(irqs_disabled());
> > #endif
> >
> > -#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) +
> defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) +
> defined(CONFIG_STACK_TRACER) + defined(CONFIG_INTERRUPT_OFF_HIST) +
> defined(CONFIG_PREEMPT_OFF_HIST) + defined(CONFIG_WAKEUP_LATENCY_HIST)
> + defined(CONFIG_DEBUG_SLAB) + defined(CONFIG_DEBUG_PAGEALLOC) +
> defined(CONFIG_LOCKDEP) + (defined(CONFIG_FTRACE) -
> defined(CONFIG_FTRACE_MCOUNT_RECORD)))
> > +#define DEBUG_COUNT (defined(CONFIG_DEBUG_RT_MUTEXES) +
> defined(CONFIG_IRQSOFF_TRACER) + defined(CONFIG_PREEMPT_TRACER) +
> defined(CONFIG_INTERRUPT_OFF_HIST) + defined(CONFIG_PREEMPT_OFF_HIST)
> + defined(CONFIG_WAKEUP_LATENCY_HIST) + defined(CONFIG_DEBUG_SLAB) +
> defined(CONFIG_DEBUG_PAGEALLOC) + defined(CONFIG_LOCKDEP) +
> (defined(CONFIG_FTRACE) - defined(CONFIG_FTRACE_MCOUNT_RECORD)))
> >
> > #if DEBUG_COUNT > 0
> > printk(KERN_ERR
> "*****************************************************************************\n");
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-03-24 20:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-24 17:35 [PATCH 0/2] [rt-kernel] John Kacur
2010-03-24 17:35 ` [PATCH 1/2] Revert "rt: trivial fix to REMINDER block in init/main.c" John Kacur
2010-03-24 18:13 ` Steven Rostedt
2010-03-24 17:35 ` [PATCH 2/2] rt: Remove CONFIG_STACK_TRACER from DEBUG_COUNT John Kacur
2010-03-24 18:13 ` Steven Rostedt
2010-03-24 19:27 ` John Kacur
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).