Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=eb917cb66f0b4a2e48587d396771d18a3809cd3d
commit eb917cb66f0b4a2e48587d396771d18a3809cd3d
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Tue Jan 20 21:27:07 2009 +0100
nvidia-173xx-173.14.15-1-i686
- version bump, built for kernel-2.6.28
diff --git a/source/x11-extra/nvidia-173xx/FrugalBuild
b/source/x11-extra/nvidia-173xx/FrugalBuild
index 047cc70..f3797f1 100644
--- a/source/x11-extra/nvidia-173xx/FrugalBuild
+++ b/source/x11-extra/nvidia-173xx/FrugalBuild
@@ -2,14 +2,12 @@
# Maintainer: Michel Hermier <herm...@frugalware.org>
pkgname=nvidia-173xx
-pkgver=173.14.12
-pkgrel=8
+pkgver=173.14.15
+pkgrel=1
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="173.14.xx"
Finclude nvidia
-source=($source kernel-2.6.27.patch)
case "$_F_nvidia_arch" in
- x86) sha1sums=('01d297c477b95593e9fbf5c73e501a4f5617b497');;
- x86_64) sha1sums=('78d3034314df7f9c95526707d7fcf4543f5993ed');;
+ x86) sha1sums=('66429e82529590f1ba79802161c7860b998a3f13');;
+ x86_64) sha1sums=('008bf3167a35039a22935c0125e0468f643f9558');;
esac
-sha1sums=($sha1sums 'bf023524ca1afc86973015c9d65e860a959b5c56')
diff --git a/source/x11-extra/nvidia-173xx/kernel-2.6.27.patch
b/source/x11-extra/nvidia-173xx/kernel-2.6.27.patch
deleted file mode 100644
index 1ba936b..0000000
--- a/source/x11-extra/nvidia-173xx/kernel-2.6.27.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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
- }
-
-
/*******************************************************************************/
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
