Date: Monday, August 5, 2013 @ 18:16:13
Author: tpowa
Revision: 192074
upgpkg: nvidia 319.32-6
rebuild against 3.10.5, change 3.10 patch
Modified:
nvidia/trunk/PKGBUILD
nvidia/trunk/nvidia-linux-3.10.patch
-+
PKGBUILD|4
nvidia-linux-3.10.patch | 604 +-
2 files changed, 20 insertions(+), 588 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-08-05 16:04:53 UTC (rev 192073)
+++ PKGBUILD2013-08-05 16:16:13 UTC (rev 192074)
@@ -15,7 +15,7 @@
install=nvidia.install
options=(!strip)
source=('nvidia-linux-3.10.patch')
-md5sums=('547b74f49f81b22f214e2770e31d62b6')
+md5sums=('8323dcba90576dcae67c42d6ea94704e')
if [ $CARCH = i686 ]; then
_arch='x86'
@@ -34,7 +34,7 @@
cd ${srcdir}
sh ${_pkg}.run --extract-only
cd ${_pkg}/kernel
-patch -Np2 -i ${srcdir}/nvidia-linux-3.10.patch
+patch -Np3 -i ${srcdir}/nvidia-linux-3.10.patch
make SYSSRC=/usr/lib/modules/${_kernver}/build module
}
Modified: nvidia-linux-3.10.patch
===
--- nvidia-linux-3.10.patch 2013-08-05 16:04:53 UTC (rev 192073)
+++ nvidia-linux-3.10.patch 2013-08-05 16:16:13 UTC (rev 192074)
@@ -1,602 +1,34 @@
NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-i2c.c
2013-04-26 00:22:30.0 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-i2c.c 2013-05-13
05:20:55.571981365 -0400
-@@ -311,8 +311,6 @@
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
- struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--int osstatus = 0;
--BOOL wasReleased = FALSE;
-
- #if defined(KERNEL_2_4)
- if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -324,15 +322,10 @@
+diff --git a/modules/nvidia-kernel/nv-i2c.c b/modules/nvidia-kernel/nv-i2c.c
+index a702506..ece9c3c 100644
+--- a/modules/nvidia-kernel/nv-i2c.c
b/modules/nvidia-kernel/nv-i2c.c
+@@ -324,13 +324,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void
*data)
if (!pI2cAdapter) return FALSE;
// attempt release with the OS
-osstatus = i2c_del_adapter(pI2cAdapter);
+i2c_del_adapter(pI2cAdapter);
-+os_free_mem(pI2cAdapter);
-if (!osstatus)
-{
-os_free_mem(pI2cAdapter);
-wasReleased = TRUE;
-}
--
--return wasReleased;
-+return TRUE;
- }
++ os_free_mem(pI2cAdapter);
++ wasReleased = TRUE;
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -ur -X - NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c
NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c
NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c
2013-04-26 00:22:30.0 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c 2013-05-22
04:52:45.229495748 -0400
-@@ -60,60 +60,41 @@
- __entry; \
- })
-
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc, \
--__write_proc,__fops,__data)\
-- ({ \
--struct proc_dir_entry *__entry;\
--int __mode = (S_IFREG | S_IRUGO); \
--if ((NvUPtr)(__write_proc) != 0) \
--__mode |= S_IWUSR; \
--__entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
--if (__entry != NULL) \
--{ \
--if ((NvUPtr)(__read_proc) != 0)\
--__entry-read_proc = (__read_proc);\
--if ((NvUPtr)(__write_proc) != 0) \
--{ \
--__entry-write_proc = (__write_proc); \
--__entry-proc_fops = (__fops); \
--} \
--__entry-data = (__data); \
--} \
--__entry; \
--})
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
-
- #define NV_CREATE_PROC_DIR(name,parent)\
-({ \
- struct proc_dir_entry *__entry;\
- int __mode = (S_IFDIR | S_IRUGO | S_IXUGO);\
--__entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
-+__entry = proc_mkdir_mode(name, __mode, parent); \
- __entry; \
-
