From f3d2fadbacbe05ce9a86980523e0879681024653 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 7 May 2014 08:38:47 +0000 Subject: [PATCH] scst: Fix the procfs build Move the definition of scst_get_opcode_name() up such that it occurs outside #ifndef CONFIG_SCST_PROC / #endif. See also r5491. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5505 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index 9a632620e..53142c430 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -4608,6 +4608,15 @@ static inline void put_unaligned_be24(const uint32_t v, uint8_t *const p) p[2] = v >> 0; } +#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) +const char *scst_get_opcode_name(struct scst_cmd *cmd); +#else +static inline const char *scst_get_opcode_name(struct scst_cmd *cmd) +{ + return cmd->op_name; +} +#endif + #ifndef CONFIG_SCST_PROC /* @@ -4642,15 +4651,6 @@ int scst_wait_info_completion(struct scst_sysfs_user_info *info, unsigned int scst_get_setup_id(void); -#if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) -const char *scst_get_opcode_name(struct scst_cmd *cmd); -#else -static inline const char *scst_get_opcode_name(struct scst_cmd *cmd) -{ - return cmd->op_name; -} -#endif - /* * Needed to avoid potential circular locking dependency between scst_mutex