linux-4.12.patch

   1 --- kernel/conftest.sh.orig     2017-07-04 19:34:18.849964147 +0200
   2 +++ kernel/conftest.sh  2017-07-04 19:40:00.084349448 +0200
   3 @@ -362,7 +362,11 @@
   4              # Determine if the set_memory_uc() function is present.
   5              #
   6              CODE="
   7 -            #include <asm/cacheflush.h>
   8 +            #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
   9 +                #include <asm/set_memory.h>
  10 +            #else
  11 +                #include <asm/cacheflush.h>
  12 +            #endif
  13              void conftest_set_memory_uc(void) {
  14                  set_memory_uc();
  15              }"
  16 @@ -375,7 +379,11 @@
  17              # Determine if the set_memory_array_uc() function is present.
  18              #
  19              CODE="
  20 -            #include <asm/cacheflush.h>
  21 +            #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  22 +                #include <asm/set_memory.h>
  23 +            #else
  24 +                #include <asm/cacheflush.h>
  25 +            #endif
  26              void conftest_set_memory_array_uc(void) {
  27                  set_memory_array_uc();
  28              }"
  29 @@ -388,7 +396,11 @@
  30              # Determine if the set_pages_uc() function is present.
  31              #
  32              CODE="
  33 -            #include <asm/cacheflush.h>
  34 +            #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  35 +                #include <asm/set_memory.h>
  36 +            #else
  37 +                #include <asm/cacheflush.h>
  38 +            #endif
  39              void conftest_set_pages_uc(void) {
  40                  set_pages_uc();
  41              }"
  42 --- kernel/uvm/conftest.sh.orig 2017-07-04 19:41:43.317660686 +0200
  43 +++ kernel/uvm/conftest.sh      2017-07-04 19:40:23.248644401 +0200
  44 @@ -362,7 +362,11 @@
  45              # Determine if the set_memory_uc() function is present.
  46              #
  47              CODE="
  48 -            #include <asm/cacheflush.h>
  49 +            #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  50 +                #include <asm/set_memory.h>
  51 +            #else
  52 +                #include <asm/cacheflush.h>
  53 +            #endif
  54              void conftest_set_memory_uc(void) {
  55                  set_memory_uc();
  56              }"
  57 @@ -375,7 +379,11 @@
  58              # Determine if the set_memory_array_uc() function is present.
  59              #
  60              CODE="
  61 -            #include <asm/cacheflush.h>
  62 +            #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  63 +                #include <asm/set_memory.h>
  64 +            #else
  65 +                #include <asm/cacheflush.h>
  66 +            #endif
  67              void conftest_set_memory_array_uc(void) {
  68                  set_memory_array_uc();
  69              }"
  70 @@ -388,7 +396,11 @@
  71              # Determine if the set_pages_uc() function is present.
  72              #
  73              CODE="
  74 -            #include <asm/cacheflush.h>
  75 +            #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  76 +                #include <asm/set_memory.h>
  77 +            #else
  78 +                #include <asm/cacheflush.h>
  79 +            #endif
  80              void conftest_set_pages_uc(void) {
  81                  set_pages_uc();
  82              }"
  83 --- kernel/nv-vm.c.orig 2017-07-04 20:01:37.098802679 +0200
  84 +++ kernel/nv-vm.c      2017-07-04 20:02:23.720384972 +0200
  85 @@ -13,6 +13,10 @@
  86  #include "nv.h"
  87  #include "nv-linux.h"
  88
  89 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
  90 +    #include <asm/set_memory.h>
  91 +#endif
  92 +
  93  static inline void nv_set_contig_memory_uc(nv_pte_t *page_ptr, NvU32 num_pages)
  94  {
  95      if (nv_update_memory_types)