D54060.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54060.id.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>
	@@ -169,9 +171,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
	@@ -104,6 +104,7 @@
	pcib_if.h \
	vnode_if.h \
	usb_if.h \
	+ opt_linuxkpi.h \
	opt_usb.h \
	opt_stack.h

	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