summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/conf/DEFAULTS3
-rw-r--r--sys/i386/conf/DEFAULTS3
-rw-r--r--sys/ia64/conf/DEFAULTS3
-rw-r--r--sys/pc98/conf/DEFAULTS3
-rw-r--r--sys/powerpc/conf/DEFAULTS3
-rw-r--r--sys/sparc64/conf/DEFAULTS3
-rw-r--r--sys/sparc64/sparc64/machdep.c12
-rw-r--r--sys/sun4v/conf/DEFAULTS3
8 files changed, 27 insertions, 6 deletions
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index 4cf775f..64498c7 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -17,3 +17,6 @@ device uart_ns8250
# KSE support went from being default to a kernel option
options KSE
+
+# Kernel support for loading DTrace modules
+options KDTRACE
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index 50a30ee..17174b4 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -21,3 +21,6 @@ device uart_ns8250
# KSE support went from being default to a kernel option
options KSE
+
+# Kernel support for loading DTrace modules
+options KDTRACE
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
index c36a967..a66c596 100644
--- a/sys/ia64/conf/DEFAULTS
+++ b/sys/ia64/conf/DEFAULTS
@@ -20,3 +20,6 @@ options GEOM_MBR
# KSE support went from being default to a kernel option
options KSE
+
+# Kernel support for loading DTrace modules
+options KDTRACE
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index 7fd3dba..6b480b7 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -23,3 +23,6 @@ device uart_ns8250
# KSE support went from being default to a kernel option
options KSE
+
+# Kernel support for loading DTrace modules
+options KDTRACE
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index c25145a..833b14d 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -14,3 +14,6 @@ device uart_z8530
# KSE support went from being default to a kernel option
options KSE
+
+# Kernel support for loading DTrace modules
+options KDTRACE
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
index 8545b37..f1cfbd7 100644
--- a/sys/sparc64/conf/DEFAULTS
+++ b/sys/sparc64/conf/DEFAULTS
@@ -15,3 +15,6 @@ device uart_z8530
# KSE support went from being default to a kernel option
options KSE
+
+# Kernel support for loading DTrace modules
+options KDTRACE
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index 84eea0b..ab9d74e 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -330,6 +330,12 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec)
tick_init(clock);
/*
+ * Initialize global registers.
+ */
+ pc = (struct pcpu *)(pcpu0 + (PCPU_PAGES * PAGE_SIZE)) - 1;
+ cpu_setregs(pc);
+
+ /*
* Initialize the console before printing anything.
*/
cninit();
@@ -409,7 +415,6 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec)
* stack, so don't pass the real size (PAGE_SIZE) to pcpu_init or
* it'll zero it out from under us.
*/
- pc = (struct pcpu *)(pcpu0 + (PCPU_PAGES * PAGE_SIZE)) - 1;
pcpu_init(pc, 0, sizeof(struct pcpu));
pc->pc_curthread = &thread0;
pc->pc_curpcb = thread0.td_pcb;
@@ -421,11 +426,6 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec)
pc->pc_tlb_ctx_max = TLB_CTX_USER_MAX;
/*
- * Initialize global registers.
- */
- cpu_setregs(pc);
-
- /*
* Initialize the message buffer (after setting trap table).
*/
msgbufinit(msgbufp, MSGBUF_SIZE);
diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS
index a4bea1a..4efe701 100644
--- a/sys/sun4v/conf/DEFAULTS
+++ b/sys/sun4v/conf/DEFAULTS
@@ -7,3 +7,6 @@ machine sun4v
# Pseudo devices.
device mem # Memory and kernel memory devices
+
+# Kernel support for loading DTrace modules
+options KDTRACE
OpenPOWER on IntegriCloud