From a952a3584baca89b59d54d58a6c6dcd2a7193880 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 19 Nov 2020 03:47:09 +0000 Subject: [PATCH] scst: Unbreak the build for kernel versions 3.0..4.16 Reported-by: Gilbert Standen git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9184 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 0fff88b04..f8d91e996 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -33,6 +33,9 @@ #include #include #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) +#include +#endif #include /* struct scatterlist */ #include /* kmalloc() */ #include /* sizeof_field() */ @@ -849,15 +852,18 @@ enum kobj_ns_type { * 172856eac7cf ("kobject: Export kobj_ns_grab_current() and kobj_ns_drop()"; * v4.16). */ -static inline void *kobj_ns_grab_current(enum kobj_ns_type type) +static inline void *kobj_ns_grab_current_backport(enum kobj_ns_type type) { WARN_ON_ONCE(type != KOBJ_NS_TYPE_NET); return &init_net; } -static inline void kobj_ns_drop(enum kobj_ns_type type, void *ns) +static inline void kobj_ns_drop_backport(enum kobj_ns_type type, void *ns) { } + +#define kobj_ns_grab_current kobj_ns_grab_current_backport +#define kobj_ns_drop kobj_ns_drop_backport #endif /* */