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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-12-20 14:35:05 -08:00
parent 47f50e0948 8ddd93ee2a
commit 6cbadbf293
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nightly/conf/nightly.conf
View File

@@ -75,5 +75,4 @@ ABT_KERNELS=" \
2.6.32-696.30.1.el6^CentOS^6.9-nc \
5.4.17-2036.101.2.el7uek^UEK^7-nc \
4.14.35-2025.403.3.el7uek^UEK^7-nc \
4.1.12-124.45.6.el7uek^UEK^7-nc \
"

23
scripts/kernel-functions
View File

@@ -598,29 +598,6 @@ index 8fa38d3e7538..f5bc4c046461 100644
EOF
;;
4.1.12-*uek)
echo "Patching init.h ..."
patch -f -s -p1 <<'EOF'
--- linux-4.1.12-124.45.6.el7uek/include/linux/init.h.orig
+++ linux-4.1.12-124.45.6.el7uek/include/linux/init.h
@@ -347,13 +347,13 @@
#define module_init(initfn) \
static inline initcall_t __inittest(void) \
{ return initfn; } \
- int init_module(void) __attribute__((alias(#initfn)));
+ int init_module(void) __attribute__((__copy__(initfn)));
/* This is only required if you want to be unloadable. */
#define module_exit(exitfn) \
static inline exitcall_t __exittest(void) \
{ return exitfn; } \
- void cleanup_module(void) __attribute__((alias(#exitfn)));
+ void cleanup_module(void) __attribute__((__copy__(exitfn)));
#define __setup_param(str, unique_id, fn) /* nothing */
#define __setup(str, func) /* nothing */
EOF
;;
2.*|3.*)
patch -f -s -p1 <<'EOF'
--- linux-3.10.0-1127.el7/include/linux/init.h.orig 2020-05-09 20:55:48.638956513 -0700