- fix patch for 4.11

- rel 3

diff --git a/linux-4.11.patch b/linux-4.11.patch
index 04eb7f1b2cfda03e6b208ae13e7aa1c355e4f16b..6094fc9fe3bab8a0e618dee15d89f0ec4c44b13f 100644 (file)
--- a/linux-4.11.patch
+++ b/linux-4.11.patch
@@ -13,7 +13,7 @@
 \r
          #else\r
 \r
 \r
          #else\r
 \r

-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)\r

                 return get_user_pages_remote(tsk, mm, start, nr_pages, flags,\r
                                              pages, vmas);\r
 +#else\r
                 return get_user_pages_remote(tsk, mm, start, nr_pages, flags,\r
                                              pages, vmas);\r
 +#else\r


@@ -29,7 +29,7 @@
  }\r
 \r
  #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r
  }\r
 \r
  #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r

-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)\r

  static int\r
  nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)\r
  {\r
  static int\r
  nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)\r
  {\r


@@ -72,7 +72,7 @@
  #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r
          if (nv_pat_mode == NV_PAT_MODE_BUILTIN)\r
          {\r
  #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r
          if (nv_pat_mode == NV_PAT_MODE_BUILTIN)\r
          {\r

-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)\r

              if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)\r
 +#else\r
 +            if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,\r
              if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)\r
 +#else\r
 +            if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,\r


@@ -87,7 +87,7 @@
      {\r
          nv_disable_pat_support();\r
  #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r
      {\r
          nv_disable_pat_support();\r
  #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)\r

-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)\r

          unregister_hotcpu_notifier(&nv_hotcpu_nfb);\r
 +#else\r
 +        cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);\r
          unregister_hotcpu_notifier(&nv_hotcpu_nfb);\r
 +#else\r
 +        cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);\r


@@ -97,30 +97,39 @@
  }\r
 --- kernel/nv-drm.c    2017-03-31 03:42:21.000000000 +0200\r
 +++ kernel/nv-drm.c    2017-04-06 23:53:14.273356795 +0200\r
  }\r
 --- kernel/nv-drm.c    2017-03-31 03:42:21.000000000 +0200\r
 +++ kernel/nv-drm.c    2017-04-06 23:53:14.273356795 +0200\r

-@@ -48,7 +48,7 @@\r
+@@ -48,7 +48,11 @@\r

      return -ENODEV;\r
  }\r
 \r
      return -ENODEV;\r
  }\r
 \r

--static int nv_drm_unload(\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)\r
+ static int nv_drm_unload(\r
++else\r

 +static void nv_drm_unload(\r
 +static void nv_drm_unload(\r

++#endif\r

      struct drm_device *dev\r
  )\r
  {\r
      struct drm_device *dev\r
  )\r
  {\r

-@@ -60,7 +60,7 @@\r
+@@ -60,7 +60,11 @@\r

      {\r
          if (nvl->dev == dev->pdev)\r
          {\r
      {\r
          if (nvl->dev == dev->pdev)\r
          {\r

--            return 0;\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)\r
+             return 0;\r
++else\r

 +            return;\r
 +            return;\r

++#endif\r

          }\r
      }\r
  \r
          }\r
      }\r
  \r

-@@ -64,7 +64,7 @@\r
+@@ -64,7 +64,11 @@\r

          }\r
      }\r
 \r
          }\r
      }\r
 \r

--    return -ENODEV;\r
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)\r
+     return -ENODEV;\r
++else\r

 +    return;\r
 +    return;\r

++#endif\r

  }\r
 \r
  static void nv_gem_free(\r
  }\r
 \r
  static void nv_gem_free(\r

diff --git a/xorg-driver-video-nvidia-legacy-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec
index b0383365a655f3970ab7c2542ff980b5482e1e1f..2d9ee307ddbe9cd8e0094cd7a31b0d1812d93c08 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -25,7 +25,7 @@ exit 1
 
 %define                no_install_post_check_so 1
 
 
 %define                no_install_post_check_so 1
 

-%define                rel     2
+%define                rel     3

 %define                mname   nvidia-legacy-304xx
 %define                pname   xorg-driver-video-%{mname}
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 %define                mname   nvidia-legacy-304xx
 %define                pname   xorg-driver-video-%{mname}
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips