diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
index 34a00d02cb..71019f5f12 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
@@ -32,9 +32,15 @@
 
 #include "PartitionMap.h"
 
-//#define TRACE(x) ;
-#define TRACE(x) dprintf x
+#define TRACE_ENABLED
 
+#ifdef TRACE_ENABLED
+#	ifdef _USER_MODE
+#		define TRACE(x) printf x
+#	else
+#		define TRACE(x) dprintf x
+#	endif
+#endif
 
 using std::nothrow;
 
diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp b/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
index b898598d07..1c94936bc1 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
@@ -21,9 +21,15 @@
 #include "PartitionMap.h"
 #include "PartitionMapParser.h"
 
-//#define TRACE(x) ;
-#define TRACE(x) dprintf x
+#define TRACE_ENABLED
 
+#ifdef TRACE_ENABLED
+#	ifdef _USER_MODE
+#		define TRACE(x) printf x
+#	else
+#		define TRACE(x) dprintf x
+#	endif
+#endif
 
 using std::nothrow;