From 3f6724a90f10416f5eff5d9d8e774942e0149010 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 17 Mar 2011 02:50:41 +0100
Subject: [PATCH] kernel: Fix x86_64 building without 'options DDB'.

---
 sys/platform/pc64/conf/files    | 4 ++--
 sys/platform/pc64/x86_64/trap.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files
index c3f3eae134..25b8679fe1 100644
--- a/sys/platform/pc64/conf/files
+++ b/sys/platform/pc64/conf/files
@@ -152,8 +152,8 @@ platform/pc64/x86_64/support.s		standard
 platform/pc64/x86_64/sigtramp.s		standard
 platform/pc64/x86_64/swtch.s		standard
 platform/pc64/x86_64/npx.c		standard
-platform/pc64/x86_64/db_interface.c	standard
-platform/pc64/x86_64/db_trace.c		standard
+platform/pc64/x86_64/db_interface.c	optional	ddb
+platform/pc64/x86_64/db_trace.c		optional	ddb
 platform/pc64/x86_64/dump_machdep.c	standard
 platform/pc64/x86_64/minidump_machdep.c	standard
 platform/pc64/x86_64/vm_machdep.c	standard
diff --git a/sys/platform/pc64/x86_64/trap.c b/sys/platform/pc64/x86_64/trap.c
index caea116cec..1ff4f2c95c 100644
--- a/sys/platform/pc64/x86_64/trap.c
+++ b/sys/platform/pc64/x86_64/trap.c
@@ -885,10 +885,11 @@ nogo:
 			    (void *)frame->tf_addr,
 			    (void *)frame->tf_rip,
 			    p->p_pid, p->p_comm);
+#ifdef DDB
 		if (ddb_on_seg_fault)
 			Debugger("ddb_on_seg_fault");
+#endif
 	}
-	/* Debugger("seg-fault"); */
 
 	return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV);
 }
-- 
2.41.0