Date: Mon, 23 Apr 2018 08:51:42 +0000 (UTC) From: Ram Kishore Vegesna <ram@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332883 - stable/11/sys/dev/ocs_fc Message-ID: <201804230851.w3N8pgrJ056762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ram Date: Mon Apr 23 08:51:41 2018 New Revision: 332883 URL: https://svnweb.freebsd.org/changeset/base/332883 Log: MFC r332471, r332646: Check if STACK is defined before using the stack(9). Moved opts-stack.h include before all other includes. Approved by: mav Modified: stable/11/sys/dev/ocs_fc/ocs_os.c stable/11/sys/dev/ocs_fc/ocs_os.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ocs_fc/ocs_os.c ============================================================================== --- stable/11/sys/dev/ocs_fc/ocs_os.c Mon Apr 23 08:23:10 2018 (r332882) +++ stable/11/sys/dev/ocs_fc/ocs_os.c Mon Apr 23 08:51:41 2018 (r332883) @@ -37,9 +37,6 @@ */ #include "ocs.h" -#include <sys/sysctl.h> -#include <sys/malloc.h> -#include <sys/linker.h> /* for debug of memory allocations */ static MALLOC_DEFINE(M_OCS, "OCS", "OneCore Storage data"); @@ -855,11 +852,13 @@ void ocs_intr_enable(ocs_os_handle_t os) void ocs_print_stack(void) { +#if defined(STACK) struct stack st; stack_zero(&st); stack_save(&st); stack_print(&st); +#endif } void ocs_abort(void) Modified: stable/11/sys/dev/ocs_fc/ocs_os.h ============================================================================== --- stable/11/sys/dev/ocs_fc/ocs_os.h Mon Apr 23 08:23:10 2018 (r332882) +++ stable/11/sys/dev/ocs_fc/ocs_os.h Mon Apr 23 08:51:41 2018 (r332883) @@ -39,11 +39,11 @@ #ifndef _OCS_OS_H #define _OCS_OS_H -typedef struct ocs_softc ocs_t; - /*************************************************************************** * OS specific includes */ +#include "opt_stack.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -78,6 +78,8 @@ typedef struct ocs_softc ocs_t; #include <sys/ioccom.h> #include <sys/ctype.h> +#include <sys/linker.h> /* for debug of memory allocations */ + /* OCS_OS_MAX_ISR_TIME_MSEC - maximum time driver code should spend in an interrupt * or kernel thread context without yielding */ @@ -151,6 +153,8 @@ typedef struct ocs_softc ocs_t; /*************************************************************************** * Platform specific operations */ + +typedef struct ocs_softc ocs_t; /** * @ingroup os
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804230851.w3N8pgrJ056762>