[SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (ca4869700fc911d25fe177079fd023e965cd6b73)

Ladislav Hagara scm at sourcemage.org
Fri Oct 10 08:24:36 EDT 2008


GIT changes to master z-rejected grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 z-kernels/nvidia_legacy_173xx/HISTORY                       |    5 
 z-kernels/nvidia_legacy_173xx/INSTALL                       |    2 
 z-kernels/nvidia_legacy_173xx/NVIDIA_173.14.12_2.6.27.patch |   87 ++++++++++++
 z-kernels/nvidia_legacy_173xx/PRE_BUILD                     |    2 
 z-kernels/nvidia_legacy_173xx/glext-redef.patch             |   10 -
 5 files changed, 95 insertions(+), 11 deletions(-)

New commits:
commit ca4869700fc911d25fe177079fd023e965cd6b73
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    nvidia_legacy_173xx: added patch to be linux 2.6.27 compatible
    
    imho, beta branch should be removed, it does not support old fx card and
    it was replaced by new nvidia_driver

diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY b/z-kernels/nvidia_legacy_173xx/HISTORY
index c49d585..bd9f5dc 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -1,4 +1,9 @@
 2008-10-10 Ladislav Hagara <hgr at vabo.cz>
+	* PRE_BUILD, NVIDIA_173.14.12_2.6.27.patch: added due to linux 2.6.27
+	  from http://kanotix.com/files/173.14.12/NVIDIA_173.14.12_2.6.27.patch
+	* INSTALL, glext-redef.patch: removed disabled patch
+
+2008-10-10 Ladislav Hagara <hgr at vabo.cz>
 	* CONFLICTS: updated
 
 2008-10-08 Julien "_kaze_" ROZO <julien at rozo.org>
diff --git a/z-kernels/nvidia_legacy_173xx/INSTALL b/z-kernels/nvidia_legacy_173xx/INSTALL
index 9c41950..5c5dfdb 100755
--- a/z-kernels/nvidia_legacy_173xx/INSTALL
+++ b/z-kernels/nvidia_legacy_173xx/INSTALL
@@ -36,7 +36,7 @@ pushd  $SOURCE_DIRECTORY/usr/include/GL  &&
 if  [  !  -d  $X_PRE/include/GL  ];  then
   mkdir  -p  $X_PRE/include/GL
 fi                                       &&
-#patch -p0 < ${SPELL_DIRECTORY}/glext-redef.patch &&
+
 for file in glext.h gl.h glxext.h glx.h; do
   install  -m 0644  -o root  -g root  $file  $X_PRE/include/GL/
 done                                     &&
diff --git a/z-kernels/nvidia_legacy_173xx/NVIDIA_173.14.12_2.6.27.patch b/z-kernels/nvidia_legacy_173xx/NVIDIA_173.14.12_2.6.27.patch
new file mode 100644
index 0000000..1ba936b
--- /dev/null
+++ b/z-kernels/nvidia_legacy_173xx/NVIDIA_173.14.12_2.6.27.patch
@@ -0,0 +1,87 @@
+diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv.c
+--- usr/src/nv/nv.c	2008-07-18 03:42:50.000000000 +0200
++++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv.c	2008-08-12 00:35:45.000000000 +0200
+@@ -1296,14 +1296,22 @@
+             if (get_cpu() == cpu)
+                 __nv_setup_pat_entries(NULL);
+             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;
+     }
+diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h
+--- usr/src/nv/nv-linux.h	2008-07-18 03:42:51.000000000 +0200
++++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h	2008-08-12 00:44:27.000000000 +0200
+@@ -104,7 +104,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>
+ 
+@@ -665,13 +668,21 @@
+ #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-173.14.12-pkg0.orig/usr/src/nv/os-interface.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/os-interface.c
+--- usr/src/nv/os-interface.c	2008-07-18 03:42:50.000000000 +0200
++++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/os-interface.c	2008-08-12 00:48:07.000000000 +0200
+@@ -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;
+ }
+@@ -704,7 +708,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
+ }
+ 
+ /*******************************************************************************/
diff --git a/z-kernels/nvidia_legacy_173xx/PRE_BUILD b/z-kernels/nvidia_legacy_173xx/PRE_BUILD
index a7e031e..d05aa0f 100755
--- a/z-kernels/nvidia_legacy_173xx/PRE_BUILD
+++ b/z-kernels/nvidia_legacy_173xx/PRE_BUILD
@@ -34,6 +34,8 @@ sh  $SOURCE_CACHE/$SOURCE  --extract-only                     \
                --target $SOURCE_DIRECTORY                     &&
 cd $SOURCE_DIRECTORY                                          &&
 
+patch -p0 < ${SPELL_DIRECTORY}/NVIDIA_173.14.12_2.6.27.patch  &&
+
 if [[ $VIA4X == "y" ]]; then
   sedit  "s/NVreg_EnableVia4x =0;/NVreg_EnableVia4x = 1;/"    \
                                   usr/src/nv/os-registry.c
diff --git a/z-kernels/nvidia_legacy_173xx/glext-redef.patch b/z-kernels/nvidia_legacy_173xx/glext-redef.patch
deleted file mode 100644
index 3fb0be4..0000000
--- a/z-kernels/nvidia_legacy_173xx/glext-redef.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glext.h~	2006-11-08 22:09:16.000000000 -0800
-+++ glext.h	2006-11-08 22:09:16.000000000 -0800
-@@ -6938,7 +6938,6 @@
- extern void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
- extern void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
- #endif /* GL_GLEXT_PROTOTYPES */
--typedef void (APIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
- typedef void (APIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
- typedef GLint (APIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
- typedef void (APIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);



More information about the SM-Commit mailing list