summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2005-06-29 23:23:16 +0000
committerpeter <peter@FreeBSD.org>2005-06-29 23:23:16 +0000
commitcc63da71f4a1c2d4ad36a9bc33156378e85621c6 (patch)
tree3575067378ea41860f395b8b1bf3480c5be25cca
parentdb8830bc2df63d901372f95b64e88e5acca62a62 (diff)
downloadFreeBSD-src-cc63da71f4a1c2d4ad36a9bc33156378e85621c6.zip
FreeBSD-src-cc63da71f4a1c2d4ad36a9bc33156378e85621c6.tar.gz
Move the KDB_STOP_NMI option from opt_global.h to opt_kdb.h
Approved by: re
-rw-r--r--sys/amd64/amd64/mp_machdep.c1
-rw-r--r--sys/amd64/amd64/trap.c1
-rw-r--r--sys/conf/options.amd642
-rw-r--r--sys/conf/options.i3862
-rw-r--r--sys/conf/options.pc982
-rw-r--r--sys/i386/i386/mp_machdep.c1
-rw-r--r--sys/i386/i386/trap.c1
-rw-r--r--sys/kern/subr_kdb.c2
8 files changed, 9 insertions, 3 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index c6f5a29..56d4c14 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -28,6 +28,7 @@
__FBSDID("$FreeBSD$");
#include "opt_cpu.h"
+#include "opt_kdb.h"
#include "opt_kstack_pages.h"
#include "opt_mp_watchdog.h"
#include "opt_sched.h"
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 98c1692..cb79c58 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include "opt_cpu.h"
#include "opt_hwpmc_hooks.h"
#include "opt_isa.h"
+#include "opt_kdb.h"
#include "opt_ktrace.h"
#include <sys/param.h>
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 0227bfd..fdbc8f8 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -57,4 +57,4 @@ PSM_DEBUG opt_psm.h
DEV_ATPIC opt_atpic.h
# Debugging
-KDB_STOP_NMI opt_global.h
+KDB_STOP_NMI opt_kdb.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 28446f6..33f71f0 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -162,5 +162,5 @@ DEV_NPX opt_npx.h
ASR_COMPAT opt_asr.h
# Debugging
-KDB_STOP_NMI opt_global.h
+KDB_STOP_NMI opt_kdb.h
NPX_DEBUG opt_npx.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 3dbab73..5f8db10 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -104,5 +104,5 @@ DEV_MECIA opt_mecia.h
DEV_NPX opt_npx.h
# Debugging
-KDB_STOP_NMI opt_global.h
+KDB_STOP_NMI opt_kdb.h
NPX_DEBUG opt_npx.h
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index b3404d0..ab653d7 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$");
#include "opt_apic.h"
#include "opt_cpu.h"
+#include "opt_kdb.h"
#include "opt_kstack_pages.h"
#include "opt_mp_watchdog.h"
#include "opt_sched.h"
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index d3afad1..be714dd 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include "opt_cpu.h"
#include "opt_hwpmc_hooks.h"
#include "opt_isa.h"
+#include "opt_kdb.h"
#include "opt_ktrace.h"
#include "opt_npx.h"
#include "opt_trap.h"
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 5726a84..1d39e76 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -27,6 +27,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_kdb.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kdb.h>
OpenPOWER on IntegriCloud