Messages in this thread Patch in this message | | | Subject | Re: [patch] Latency Tracer, voluntary-preempt-2.6.8-rc4-O6 | From | Peter Zijlstra <> | Date | Fri, 13 Aug 2004 11:53:40 +0200 |
| |
On Thu, 2004-08-12 at 21:49 -0700, Matt Heler wrote: > Ingo, > > I get the following error when I have CONFIG_PREEMPT_TIMING=n > > AS arch/i386/kernel/entry.o > CC arch/i386/kernel/traps.o > arch/i386/kernel/traps.c: In function `do_nmi': > arch/i386/kernel/traps.c:539: error: syntax error before "do" > arch/i386/kernel/traps.c:539: error: syntax error before ')' token > arch/i386/kernel/traps.c:537: warning: unused variable `cpu' > arch/i386/kernel/traps.c: At top level: > arch/i386/kernel/traps.c:541: warning: type defaults to `int' in declaration > of `cpu' > arch/i386/kernel/traps.c:541: warning: data definition has no type or storage > class > arch/i386/kernel/traps.c:542: error: syntax error before '++' token > arch/i386/kernel/traps.c:500: warning: `default_do_nmi' defined but not used > make[1]: *** [arch/i386/kernel/traps.o] Error 1 > make: *** [arch/i386/kernel] Error 2 > > > Matt >
This fixes it.
--- ./include/asm-i386/hardirq.h~ 2004-08-13 11:17:38.668333125 +0200 +++ ./include/asm-i386/hardirq.h 2004-08-13 11:51:40.835968747 +0200 @@ -73,7 +73,7 @@ #define hardirq_endlock() do { } while (0) #define irq_enter() add_preempt_count(HARDIRQ_OFFSET) -#define nmi_enter() (irq_enter()) +#define nmi_enter() irq_enter() #define nmi_exit() sub_preempt_count(HARDIRQ_OFFSET) #ifdef CONFIG_PREEMPT
-- Peter Zijlstra <a.p.zijlstra@chello.nl>
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |