From dd91145744f2b227ed8686bccf912fc670175abc Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 May 2020 21:08:27 +0000 Subject: [PATCH] scst: Port to Linux kernel v5.7 (merge trunk r8863) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.4.x@8897 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 15 +++++++++++++++ scst/include/scst.h | 13 ------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 32d624d5d..f33d0b432 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -1571,6 +1571,21 @@ static inline void put_unaligned_be64(uint64_t i, void *p) } #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0) +/* Only use get_unaligned_be24() if reading p - 1 is allowed. */ +static inline uint32_t get_unaligned_be24(const uint8_t *const p) +{ + return get_unaligned_be32(p - 1) & 0xffffffU; +} + +static inline void put_unaligned_be24(const uint32_t v, uint8_t *const p) +{ + p[0] = v >> 16; + p[1] = v >> 8; + p[2] = v >> 0; +} +#endif + /* */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) && \ diff --git a/scst/include/scst.h b/scst/include/scst.h index 118629bb6..c96079004 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -5390,19 +5390,6 @@ if (!(condition)) { \ } \ } while (0) -/* Only use get_unaligned_be24() if reading p - 1 is allowed. */ -static inline uint32_t get_unaligned_be24(const uint8_t *const p) -{ - return get_unaligned_be32(p - 1) & 0xffffffU; -} - -static inline void put_unaligned_be24(const uint32_t v, uint8_t *const p) -{ - p[0] = v >> 16; - p[1] = v >> 8; - p[2] = v >> 0; -} - #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) const char *scst_get_opcode_name(struct scst_cmd *cmd); #else