Changeset 40852 in vbox

Timestamp:

Apr 10, 2012 2:13:47 PM (13 years ago)

Author:

vboxsync

Message:

Config.kmk: Enabled ring-0 dtrace on solaris again.

File:

• trunk/Config.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -616 +616 @@
  VBOX_WITH_DTRACE_R3 = 1
 endif
-## Set this to enable kernel driver dtrace probes.
-#if1of ($(KBUILD_TARGET), solaris)
-# VBOX_WITH_DTRACE_R0DRV = 1
-#endif
-## Set this to enable dtrace probes in platform agnostic kernel code.
-#if1of ($(KBUILD_TARGET), solaris)
-# VBOX_WITH_DTRACE_R0 = 1
-#endif
+# Set this to enable kernel driver dtrace probes.
+if1of ($(KBUILD_TARGET), solaris)
+ VBOX_WITH_DTRACE_R0DRV = 1
+endif
+# Set this to enable all kernel driver dtrace probes.
+if1of ($(KBUILD_TARGET), solaris)
+ VBOX_WITH_NATIVE_DTRACE_R0DRV = 1
+endif
+# Set this to enable dtrace probes in platform agnostic kernel code.
+if1of ($(KBUILD_TARGET), solaris)
+ VBOX_WITH_DTRACE_R0 = 1
+endif
 # Set this to enable dtrace probes raw-mode context code.
 #VBOX_WITH_DTRACE_RC = 1
@@ -2932 +2936 @@
  TEMPLATE_VBOXR0DRV_DTRACETOOL         = VBoxTpG
  TEMPLATE_VBOXR0DRV_DEFS              += VBOX_WITH_DTRACE VBOX_WITH_DTRACE_R0DRV
+ ifdef VBOX_WITH_NATIVE_DTRACE_R0DRV                                                              
+  TEMPLATE_VBOXR0DRV_DEFS             += VBOX_WITH_NATIVE_DTRACE_R0DRV
+ endif
 else
  TEMPLATE_VBOXR0DRV_DTRACETOOL         = VBoxTpG-Disabled
@@ -2969 +2976 @@
 TEMPLATE_VBOXR0DRV_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBOXR0DRV_INSTTYPE.linux      = none
-TEMPLATE_VBOXR0DRV_DEFS                = __KERNEL__ MODULE IN_RING0 IN_RT_R0
+TEMPLATE_VBOXR0DRV_DEFS               += __KERNEL__ MODULE 
 TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
 TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
@@ -3033 +3040 @@
 
 TEMPLATE_VBOXR0DRV_TOOL                = $(VBOX_GCC_TOOL)
-TEMPLATE_VBOXR0DRV_DEFS                = _MACHDEP _KERNEL _STRICT_STDC IN_RING0 IN_RT_R0
+TEMPLATE_VBOXR0DRV_DEFS               += _MACHDEP _KERNEL _STRICT_STDC
 TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_SOLARIS_SYS_INCS)
 TEMPLATE_VBOXR0DRV_LDFLAGS             = -r -dy
@@ -3088 +3095 @@
 TEMPLATE_VBOXR0DRV_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBOXR0DRV_LDTOOL              = FREEBSDKMODLD
-TEMPLATE_VBOXR0DRV_DEFS                = _KERNEL KLD_MODULE IN_RING0 IN_RT_R0
+TEMPLATE_VBOXR0DRV_DEFS               += _KERNEL KLD_MODULE
 TEMPLATE_VBOXR0DRV_INCS                = \
         $(VBOX_FREEBSD_SRC) \