kernel-5.5.patch 1.8 KB

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