diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.10-fix.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-001-kernel-3.10.patch similarity index 98% rename from packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.10-fix.patch rename to packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-001-kernel-3.10.patch index 1f075f7121..5574b33e5a 100644 --- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/kernel-3.10-fix.patch +++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-001-kernel-3.10.patch @@ -1,6 +1,6 @@ -# https://devtalk.nvidia.com/default/topic/543728/linux/building-nvidia-driver-on-kernel-3-9-0/post/3814531/#3814531 +https://devtalk.nvidia.com/default/topic/543728/linux/building-nvidia-driver-on-kernel-3-9-0/post/3814531/#3814531 +http://pastie.org/7942599 -diff -ur -X - a/kernel/nv-i2c.c b/kernel/nv-i2c.c --- a/kernel/nv-i2c.c 2013-04-26 00:22:30.000000000 -0400 +++ b/kernel/nv-i2c.c 2013-05-13 05:20:55.571981365 -0400 @@ -311,8 +311,6 @@ @@ -31,7 +31,7 @@ diff -ur -X - a/kernel/nv-i2c.c b/kernel/nv-i2c.c } #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)) -diff -ur -X - a/kernel/nv-procfs.c b/kernel/nv-procfs.c + --- a/kernel/nv-procfs.c 2013-04-26 00:22:30.000000000 -0400 +++ b/kernel/nv-procfs.c 2013-05-22 04:52:45.229495748 -0400 @@ -60,60 +60,41 @@ @@ -163,7 +163,7 @@ diff -ur -X - a/kernel/nv-procfs.c b/kernel/nv-procfs.c } } @@ -180,12 +161,12 @@ - type = "PCIe"; + type = "PCI-E"; else type = "PCI"; - len += sprintf(page+len, "Bus Type: \t %s\n", type); diff --git a/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-002-kernel-3.10.patch b/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-002-kernel-3.10.patch new file mode 100644 index 0000000000..af29267fb9 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-002-kernel-3.10.patch @@ -0,0 +1,29 @@ +by ultraman + +--- a/kernel/nv-procfs.c 2013-03-27 22:26:51.000000000 +0100 ++++ b/kernel/nv-procfs.c 2013-07-05 12:08:43.000000000 +0200 +@@ -789,18 +791,18 @@ + if (!proc_nvidia_agp) + goto failed; + +- entry = NV_CREATE_PROC_FILE("status", proc_nvidia_agp, +- nv_procfs_read_agp_status, NULL, NULL, nv); ++ entry = proc_create_data("status", NV_PROC_RO, proc_nvidia_agp, ++ nv_procfs_read_agp_status, nv); + if (!entry) + goto failed; + +- entry = NV_CREATE_PROC_FILE("host-bridge", proc_nvidia_agp, +- nv_procfs_read_agp_info, NULL, NULL, NULL); ++ entry = proc_create_data("host-bridge", NV_PROC_RO, proc_nvidia_agp, ++ nv_procfs_read_agp_info, NULL); + if (!entry) + goto failed; + +- entry = NV_CREATE_PROC_FILE("gpu", proc_nvidia_agp, +- nv_procfs_read_agp_info, NULL, NULL, nv); ++ entry = proc_create_data("gpu", NV_PROC_RO, proc_nvidia_agp, ++ nv_procfs_read_agp_info, nv); + if (!entry) + goto failed; + }