mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-07-25 09:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-11-18 19:47:22 -08:00
parent b35c95a784 a952a3584b
commit 1fa6439c89
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/specialize-patch
+2
View File
@@ -235,6 +235,7 @@ function evaluate(stmnt, pattern, arg, op, result) {
gsub("MOFED_MINOR", MOFED_MINOR, stmnt)
}
gsub("defined\\(_COMPAT_LINUX_MM_H\\)", "0", stmnt)
gsub("defined\\(UEK_KABI_RENAME\\)", "0", stmnt)
if (SCST_IO_CONTEXT != "")
@@ -435,6 +436,7 @@ function handle_if(evaluated)
|| $0 ~ "RHEL_RELEASE_CODE" \
|| $0 ~ "SOCK_RECVMSG_HAS_FOUR_ARGS" \
|| $0 ~ "UEK_KABI_RENAME" \
|| $0 ~ "_COMPAT_LINUX_MM_H" \
|| $0 ~ "USE_PRE_440_WR_STRUCTURE" \
|| generating_upstream_patch_defined \
&& $0 ~ "GENERATING_UPSTREAM_PATCH" \
scst/include/backport.h
+8 -2
View File
@@ -33,6 +33,9 @@
#include <linux/dmapool.h>
#include <linux/eventpoll.h>
#include <linux/iocontext.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
#include <linux/kobject_ns.h>
#endif
#include <linux/scatterlist.h> /* struct scatterlist */
#include <linux/slab.h> /* kmalloc() */
#include <linux/stddef.h> /* 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
/* <linux/kref.h> */