Move inclusion of opt_printf.h around so that we can compile all the

SCSI modules outside of a sub-build from the kernel.

Differential Revision: https://reviews.freebsd.org/D9653
Sponsored by: Netflix

2 files changed, 11 insertions, 10 deletions

diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index ff08560e6428..162f506da384 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -27,6 +27,8 @@
  * SUCH DAMAGE.
  */
 
+#include "opt_printf.h"
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -72,6 +74,15 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_cam.h"
 
+/* Wild guess based on not wanting to grow the stack too much */
+#define XPT_PRINT_MAXLEN	512
+#ifdef PRINTF_BUFR_SIZE
+#define XPT_PRINT_LEN	PRINTF_BUFR_SIZE
+#else
+#define XPT_PRINT_LEN	128
+#endif
+_Static_assert(XPT_PRINT_LEN <= XPT_PRINT_MAXLEN, "XPT_PRINT_LEN is too large");
+
 /*
  * This is the maximum number of high powered commands (e.g. start unit)
  * that can be outstanding at a particular time.
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 8860e0013792..8e6027e56447 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -34,7 +34,6 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-#include "opt_printf.h"
 #endif
 
 /* Forward Declarations */
@@ -55,15 +54,6 @@ struct cam_path;
 
 #ifdef _KERNEL
 
-/* Wild guess based on not wanting to grow the stack too much */
-#define XPT_PRINT_MAXLEN	512
-#ifdef PRINTF_BUFR_SIZE
-#define XPT_PRINT_LEN	PRINTF_BUFR_SIZE
-#else
-#define XPT_PRINT_LEN	128
-#endif
-_Static_assert(XPT_PRINT_LEN <= XPT_PRINT_MAXLEN, "XPT_PRINT_LEN is too large");
-
 /*
  * Definition of an async handler callback block.  These are used to add
  * SIMs and peripherals to the async callback lists.