Sophie

Sophie

distrib > Mageia > 7 > armv7hl > by-pkgid > 5e4dee1bb767614ac7a93e8454dde6f0 > files > 8

kernel-5.6.8-1.mga7.src.rpm

diff -Nurp linux-5.5/3rdparty/ndiswrapper.old/lin2win.S linux-5.5/3rdparty/ndiswrapper/lin2win.S
--- linux-5.5/3rdparty/ndiswrapper.old/lin2win.S	2020-04-04 01:59:47.626938554 +0300
+++ linux-5.5/3rdparty/ndiswrapper/lin2win.S	2020-04-04 02:04:55.852447404 +0300
@@ -14,6 +14,7 @@
  */
 
 #include <linux/linkage.h>
+#include <linux/version.h>
 
 	.text
 
@@ -71,8 +72,12 @@
  * We get (ARGC + 1) arguments.
  */
 .macro lin2win name, argc
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
 	.type \name, @function
 	ENTRY(\name)
+#else
+	SYM_FUNC_START(\name)
+#endif
 
 	/* Create a call frame - it's optional, but good for debugging */
 	.cfi_startproc
@@ -125,7 +130,11 @@
 	.cfi_restore %rbp
 	ret
 	.cfi_endproc
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
 	.size	\name, (. - \name)
+#else
+	SYM_FUNC_END(\name)
+#endif
 .endm
 
 /* Define lin2winN functions */
diff -Nurp linux-5.5/3rdparty/ndiswrapper.old/win2lin_stubs.S linux-5.5/3rdparty/ndiswrapper/win2lin_stubs.S
--- linux-5.5/3rdparty/ndiswrapper.old/win2lin_stubs.S	2020-04-04 01:59:47.630938742 +0300
+++ linux-5.5/3rdparty/ndiswrapper/win2lin_stubs.S	2020-04-04 02:04:55.852447404 +0300
@@ -14,6 +14,7 @@
  */
 
 #include <linux/linkage.h>
+#include <linux/version.h>
 
 #ifdef CONFIG_X86_64
 
@@ -141,8 +142,12 @@ In Linux it should look like:
 
 /* Declare function LONGNAME, call function SHORTNAME with ARGC arguments */
 .macro win2linm longname, shortname, argc
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
 	.type \longname, @function
 	ENTRY(\longname)
+#else
+	SYM_FUNC_START(\longname)
+#endif
 
 	/* Create a call frame - it's optional, but good for debugging */
 	.cfi_startproc
@@ -243,7 +248,11 @@ In Linux it should look like:
 	.cfi_restore %rbp
 	ret
 	.cfi_endproc
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
 	.size \longname, (. - \longname)
+#else
+	SYM_FUNC_END(\longname)
+#endif
 .endm
 
 #define win2lin(name, argc) win2linm win2lin_ ## name ## _ ## argc, name, argc