Re: [patch] preempt-trace-fixes.patch

Dominik Karall
2005-08-05T18:15:48Z

[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]

On Friday 05 August 2005 17:13, Ingo Molnar wrote:
> * Dominik Karall <dominik.karall@gmx.net> wrote:
> > > yeah. I've done this today and have split it out of the -RT tree, see
> > > the patch below. After some exposure in -mm i'd like this feature to go
> > > upstream too.
> > >
> > > the patch is against recent Linus trees, 2.6.13-rc4 or later should all
> > > work. Dominik, could you try it and send us the new kernel logs
> > > whenever you happen to hit that warning message again? (Please also
> > > enable CONFIG_KALLSYMS_ALL, so that we get as much symbolic data as
> > > possible.)
> >
> > I tried to compile the patch on top of 2.6.13-rc4-mm1, it applied with a
> > few offsets, but it looked ok.
> > Here is the error I get when I compiled it:
>
> ok, does the additional patch below fix things for you?

Yes, only out_count wasn't defined in softirq.c, here's the patch to fix it.
The first patch in traps.c failed on rc4-mm1, but it doesn't matter, as
sched.h seems to be already included there. I think it is even included in
-rc4 too.

dominik

-----

--- linux/kernel/softirq.c.orig 2005-08-05 20:00:28.000000000 +0200
+++ linux/kernel/softirq.c 2005-08-05 20:02:40.000000000 +0200
@@ -93,7 +93,7 @@ restart:
do {
if (pending & 1) {
#ifdef CONFIG_DEBUG_PREEMPT
- u32 in_count = preempt_count();
+ u32 in_count = preempt_count(), out_count;
#endif
h->action(h);
#ifdef CONFIG_DEBUG_PREEMPT

[-- Attachment #2: Type: application/pgp-signature, Size: 316 bytes --]