[patch] Fixes nvida-drivers-96.43.07 for kernel-2.6.27

nvida.96.43.07-kernel2.6.27.patch (text/plain), 3.42 KB, created by Roy Bamford on 2008-10-17 15:28:03 UTC

diff -Nru NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-96.43.07-pkg0.patched/usr/src/nv/nv-linux.h
--- NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/nv-linux.h	2008-07-02 20:34:03.000000000 +0100
+++ NVIDIA-Linux-x86-96.43.07-pkg0.patched/usr/src/nv/nv-linux.h	2008-10-17 15:23:49.000000000 +0100
@@ -103,7 +103,10 @@
 #endif
 
 #include <linux/spinlock.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#else
 #include <asm/semaphore.h>
+#endif
 #include <linux/completion.h>
 #include <linux/highmem.h>
 
@@ -618,13 +621,22 @@
 #if defined(preempt_disable)
     preempt_disable();
 #endif
+
+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+    ret = smp_call_function(func, info, 1);
+    #else
     ret = smp_call_function(func, info, 1, 1);
+    #endif
     func(info);
 #if defined(preempt_enable)
     preempt_enable();
 #endif
 #else
+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+    ret = on_each_cpu(func, info, 1);
+    #else
     ret = on_each_cpu(func, info, 1, 1);
+    #endif
 #endif
     return ret;
 }
diff -Nru NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/nv.c NVIDIA-Linux-x86-96.43.07-pkg0.patched/usr/src/nv/nv.c
--- NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/nv.c	2008-07-02 20:34:03.000000000 +0100
+++ NVIDIA-Linux-x86-96.43.07-pkg0.patched/usr/src/nv/nv.c	2008-10-17 15:13:35.000000000 +0100
@@ -1187,17 +1187,25 @@
         case CPU_ONLINE:
             if (get_cpu() == cpu)
                 __nv_setup_pat_entries(NULL);
-            else
-                smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1);
-            put_cpu();
-            break;
-        case CPU_DOWN_PREPARE:
-            if (get_cpu() == cpu)
-                __nv_restore_pat_entries(NULL);
-            else
-                smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1);
-            put_cpu();
-            break;
+             else
+	    	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+		smp_call_function(__nv_setup_pat_entries, hcpu, 1);
+		#else
+                 smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1);
+		#endif
+             put_cpu();
+             break;
+         case CPU_DOWN_PREPARE:
+             if (get_cpu() == cpu)
+                 __nv_restore_pat_entries(NULL);
+             else
+	    	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+		smp_call_function(__nv_restore_pat_entries, hcpu, 1);
+		#else
+                 smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1);
+		#endif
+             put_cpu();
+             break;
     }
 
     return NOTIFY_OK;
diff -Nru NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/os-interface.c NVIDIA-Linux-x86-96.43.07-pkg0.patched/usr/src/nv/os-interface.c
--- NVIDIA-Linux-x86-96.43.07-pkg0/usr/src/nv/os-interface.c	2008-07-02 20:34:03.000000000 +0100
+++ NVIDIA-Linux-x86-96.43.07-pkg0.patched/usr/src/nv/os-interface.c	2008-10-17 15:28:54.000000000 +0100
@@ -48,7 +48,11 @@
 #endif
     local_bh_disable();
     atomic_set(&os_smp_barrier, 1);
+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+    ret = smp_call_function(ipi_handler, NULL, 0);
+    #else    
     ret = smp_call_function(ipi_handler, NULL, 1, 0);
+    #endif
 #endif
     return (ret == 0) ? RM_OK : RM_ERROR;
 }
@@ -632,7 +636,9 @@
     U032 sig
 )
 {
+    #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
     return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK;
+    #endif
 }
 
 /*******************************************************************************/