Index: linux-2.6.13-rc6-mm1/arch/ia64/mm/fault.c
===================================================================
--- linux-2.6.13-rc6-mm1.orig/arch/ia64/mm/fault.c	2005-08-19 11:47:20.000000000 -0700
+++ linux-2.6.13-rc6-mm1/arch/ia64/mm/fault.c	2005-08-23 15:33:59.000000000 -0700
@@ -104,12 +104,16 @@ ia64_do_page_fault (unsigned long addres
 		goto bad_area_no_up;
 #endif
 
+#ifdef CONFIG_KPROBES
 	/*
-	 * This is to handle the kprobes on user space access instructions
+	 * This is to handle the kprobes on user space access instructions.
+	 * Note that this is a notifier in a critical performance path.
+	 * This will limit the performance of the page fault handler.
 	 */
 	if (notify_die(DIE_PAGE_FAULT, "page fault", regs, code, TRAP_BRKPT,
 					SIGSEGV) == NOTIFY_STOP)
 		return;
+#endif
 
 	down_read(&mm->mmap_sem);