ndiswrapper/repos/community-x86_64/kernel-5.5.patch

   1 diff -u -r ndiswrapper-1.62-5.4/driver/lin2win.S ndiswrapper-1.62-5.5/driver/lin2win.S
   2 --- ndiswrapper-1.62-5.4/driver/lin2win.S       2019-02-11 04:11:14.000000000 +0000
   3 +++ ndiswrapper-1.62-5.5/driver/lin2win.S       2020-01-27 22:33:17.363779223 +0000
   4 @@ -14,6 +14,7 @@
   5   */
   6
   7  #include <linux/linkage.h>
   8 +#include <linux/version.h>
   9
  10         .text
  11
  12 @@ -71,8 +72,12 @@
  13   * We get (ARGC + 1) arguments.
  14   */
  15  .macro lin2win name, argc
  16 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
  17         .type \name, @function
  18         ENTRY(\name)
  19 +#else
  20 +       SYM_FUNC_START(\name)
  21 +#endif
  22
  23         /* Create a call frame - it's optional, but good for debugging */
  24         .cfi_startproc
  25 @@ -125,7 +130,11 @@
  26         .cfi_restore %rbp
  27         ret
  28         .cfi_endproc
  29 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
  30         .size   \name, (. - \name)
  31 +#else
  32 +       SYM_FUNC_END(\name)
  33 +#endif
  34  .endm
  35
  36  /* Define lin2winN functions */
  37 diff -u -r ndiswrapper-1.62-5.4/driver/win2lin_stubs.S ndiswrapper-1.62-5.5/driver/win2lin_stubs.S
  38 --- ndiswrapper-1.62-5.4/driver/win2lin_stubs.S 2019-02-11 04:11:14.000000000 +0000
  39 +++ ndiswrapper-1.62-5.5/driver/win2lin_stubs.S 2020-01-27 22:33:20.867163026 +0000
  40 @@ -14,6 +14,7 @@
  41   */
  42
  43  #include <linux/linkage.h>
  44 +#include <linux/version.h>
  45
  46  #ifdef CONFIG_X86_64
  47
  48 @@ -141,8 +142,12 @@
  49
  50  /* Declare function LONGNAME, call function SHORTNAME with ARGC arguments */
  51  .macro win2linm longname, shortname, argc
  52 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
  53         .type \longname, @function
  54         ENTRY(\longname)
  55 +#else
  56 +       SYM_FUNC_START(\longname)
  57 +#endif
  58
  59         /* Create a call frame - it's optional, but good for debugging */
  60         .cfi_startproc
  61 @@ -243,7 +248,11 @@
  62         .cfi_restore %rbp
  63         ret
  64         .cfi_endproc
  65 +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
  66         .size \longname, (. - \longname)
  67 +#else
  68 +       SYM_FUNC_END(\longname)
  69 +#endif
  70  .endm
  71
  72  #define win2lin(name, argc) win2linm win2lin_ ## name ## _ ## argc, name, argc