Page MenuHomeFreeBSD
Files F158978873

D54060.diff
No OneTemporary
Actions

D54060.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -30,6 +30,8 @@
#ifndef _LINUXKPI_LINUX_KERNEL_H_
#define _LINUXKPI_LINUX_KERNEL_H_
+#include "opt_linuxkpi.h"
+
#include <sys/types.h>
#include <sys/systm.h>
#include <sys/param.h>
@@ -173,9 +175,9 @@
/*
* The "pr_debug()" and "pr_devel()" macros should produce zero code
- * unless DEBUG is defined:
+ * unless LINUXKPI_DEBUG is defined:
*/
-#ifdef DEBUG
+#ifdef LINUXKPI_DEBUG
extern int linuxkpi_debug;
#define pr_debug(fmt, ...) \
do { \
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -103,6 +103,7 @@
pci_iov_if.h \
pcib_if.h \
vnode_if.h \
+ opt_linuxkpi.h \
opt_stack.h
.if ${MK_USB} != "no"
diff --git a/sys/conf/options b/sys/conf/options
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -903,6 +903,9 @@
TDMA_TXRATE_11NA_DEFAULT opt_tdma.h
TDMA_TXRATE_11NG_DEFAULT opt_tdma.h
+# LinuxKPI
+LINUXKPI_DEBUG opt_linuxkpi.h
+
# VideoMode
PICKMODE_DEBUG opt_videomode.h
diff --git a/sys/conf/std.debug b/sys/conf/std.debug
--- a/sys/conf/std.debug
+++ b/sys/conf/std.debug
@@ -17,3 +17,4 @@
options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence
options KDTRACE_MIB_SDT # Add SDT probes to network counters
options TCP_HPTS_KTEST # Add KTEST support for HPTS
+options LINUXKPI_DEBUG # Add LinuxKPI pr_debug/pr_devel support
diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug
--- a/sys/conf/std.nodebug
+++ b/sys/conf/std.nodebug
@@ -17,6 +17,7 @@
nooptions QUEUE_MACRO_DEBUG_TRASH
nooptions KDTRACE_MIB_SDT
nooptions TCP_HPTS_KTEST
+nooptions LINUXKPI_DEBUG
# Net80211 debugging
nooptions IEEE80211_DEBUG

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 9, 1:38 PM (14 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33831432
Default Alt Text
D54060.diff (1 KB)

Event Timeline