Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/nvidia-drivers/files: nvidia-drivers-173.14.30-2.6.39.patch nvidia-drivers-260.19.44-2.6.39.patch
Date: Sat, 28 May 2011 15:15:51
Message-Id: 20110528151541.75AD820057@flycatcher.gentoo.org
1 vapier 11/05/28 15:15:41
2
3 Added: nvidia-drivers-173.14.30-2.6.39.patch
4 nvidia-drivers-260.19.44-2.6.39.patch
5 Log:
6 Fix building with linux-2.6.39 #368939 by Alex Buell.
7
8 (Portage version: 2.2.0_alpha33/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch?rev=1.1&content-type=text/plain
15
16 Index: nvidia-drivers-173.14.30-2.6.39.patch
17 ===================================================================
18 linux/smp_lock.h no longer exists in linux-2.6.39+
19
20 --- a/usr/src/nv/nv-linux.h
21 +++ b/usr/src/nv/nv-linux.h
22 @@ -87,7 +87,9 @@
23 #if !defined(KERNEL_2_4)
24 #include <linux/sched.h> /* suser(), capable() replacement */
25 #include <linux/moduleparam.h> /* module_param() */
26 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
27 #include <linux/smp_lock.h> /* kernel_locked */
28 +#endif
29 #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */
30 #include <asm/kmap_types.h> /* page table entry lookup */
31 #endif
32
33
34
35 1.1 x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch?rev=1.1&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch?rev=1.1&content-type=text/plain
39
40 Index: nvidia-drivers-260.19.44-2.6.39.patch
41 ===================================================================
42 linux/smp_lock.h no longer exists in linux-2.6.39+
43
44 --- a/kernel/nv-linux.h
45 +++ b/kernel/nv-linux.h
46 @@ -87,7 +87,9 @@
47 #if !defined(KERNEL_2_4)
48 #include <linux/sched.h> /* suser(), capable() replacement */
49 #include <linux/moduleparam.h> /* module_param() */
50 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
51 #include <linux/smp_lock.h> /* kernel_locked */
52 +#endif
53 #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */
54 #include <asm/kmap_types.h> /* page table entry lookup */
55 #endif