--- arch/i386/kernel/irq.c~	2004-08-16 20:01:58.835999719 +0200
+++ arch/i386/kernel/irq.c	2004-08-16 20:26:24.974943041 +0200
@@ -219,7 +219,9 @@
 	unsigned int status;
 
 	irq_enter();
+#ifdef CONFIG_LATENCY_TRACE
 	__trace((unsigned long)do_IRQ, regs.eip);
+#endif
 
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
 	/* Debugging check for stack overflow: is there less than 1KB free? */
--- arch/i386/kernel/traps.c~	2004-08-16 20:01:58.836999745 +0200
+++ arch/i386/kernel/traps.c	2004-08-16 20:26:48.156378051 +0200
@@ -537,7 +537,9 @@
 	int cpu;
 
 	nmi_enter();
+#ifdef CONFIG_LATENCY_TRACE
 	__trace((unsigned long)do_nmi, regs->eip);
+#endif
 
 	cpu = smp_processor_id();
 	++nmi_count(cpu);
--- arch/i386/mm/fault.c~	2004-08-16 20:01:58.837999771 +0200
+++ arch/i386/mm/fault.c	2004-08-16 20:27:08.181753770 +0200
@@ -223,7 +223,9 @@
 	int write;
 	siginfo_t info;
 
+#ifdef CONFIG_LATENCY_TRACE
 	__trace((unsigned long)do_page_fault, regs->eip);
+#endif
 
 	/* get the address */
 	__asm__("movl %%cr2,%0":"=r" (address));