Gentoo Archives: gentoo-commits

From: "Fabio Erculiani (lxnay)" <lxnay@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers/files: ati-drivers-2.6.33.patch ati-drivers-fix_compilation-bug-297322.patch
Date: Sun, 28 Feb 2010 17:31:57
Message-Id: E1Nlmzc-0004AO-IF@stork.gentoo.org
1 lxnay 10/02/28 17:31:48
2
3 Added: ati-drivers-2.6.33.patch
4 ati-drivers-fix_compilation-bug-297322.patch
5 Log:
6 add 2.6.33 kernel support and really close bug 297322
7 (Portage version: 2.2_rc62/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-2.6.33.patch?rev=1.1&content-type=text/plain
14
15 Index: ati-drivers-2.6.33.patch
16 ===================================================================
17 --- work.orig/common/lib/modules/fglrx/build_mod/drmP.h
18 +++ work/common/lib/modules/fglrx/build_mod/drmP.h
19 @@ -42,7 +42,11 @@
20 * can build the DRM (part of PI DRI). 4/21/2000 S + B */
21 #include <asm/current.h>
22 #endif /* __alpha__ */
23 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
24 +#include <generated/autoconf.h>
25 +#else
26 #include <linux/autoconf.h>
27 +#endif
28 #include <linux/module.h>
29 #include <linux/kernel.h>
30 #include <linux/miscdevice.h>
31 --- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
32 +++ work/common/lib/modules/fglrx/build_mod/firegl_public.c
33 @@ -28,7 +28,11 @@
34 #error Kernel versions older than 2.6.0 are no longer supported by this module.
35 #endif
36
37 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
38 +#include <generated/autoconf.h>
39 +#else
40 #include <linux/autoconf.h>
41 +#endif
42
43 #if !defined(CONFIG_X86)
44 #if !defined(CONFIG_X86_PC)
45 @@ -163,8 +167,12 @@
46
47 // For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h.
48 #ifndef UTS_RELEASE
49 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
50 +#include <generated/utsrelease.h>
51 +#else
52 #include <linux/utsrelease.h>
53 #endif
54 +#endif
55
56 #if defined(__i386__)
57 #ifndef do_div
58 --- work.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c
59 +++ work/common/lib/modules/fglrx/build_mod/kcl_acpi.c
60 @@ -15,7 +15,11 @@
61 ****************************************************************************/
62
63 #include <linux/version.h>
64 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
65 +#include <generated/autoconf.h>
66 +#else
67 #include <linux/autoconf.h>
68 +#endif
69 #include <linux/acpi.h>
70
71 #include "kcl_config.h"
72 --- work.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
73 +++ work/common/lib/modules/fglrx/build_mod/kcl_agp.c
74 @@ -31,7 +31,11 @@
75 */
76
77 #include <linux/version.h>
78 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
79 +#include <generated/autoconf.h>
80 +#else
81 #include <linux/autoconf.h>
82 +#endif
83 #include <linux/pci.h>
84 #include <linux/agp_backend.h>
85 #include <linux/string.h>
86 --- work.orig/common/lib/modules/fglrx/build_mod/kcl_io.c
87 +++ work/common/lib/modules/fglrx/build_mod/kcl_io.c
88 @@ -37,7 +37,11 @@
89 */
90
91 #include <linux/version.h>
92 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
93 +#include <generated/autoconf.h>
94 +#else
95 #include <linux/autoconf.h>
96 +#endif
97 #include <linux/poll.h>
98 #include <linux/signal.h>
99 #include <asm/io.h>
100 --- work.orig/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
101 +++ work/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
102 @@ -20,7 +20,11 @@
103 #define KCL_OSCONFIG_H
104
105 #include <linux/version.h>
106 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
107 +#include <generated/autoconf.h>
108 +#else
109 #include <linux/autoconf.h>
110 +#endif
111
112 // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
113 #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
114 --- work.orig/common/lib/modules/fglrx/build_mod/kcl_pci.c
115 +++ work/common/lib/modules/fglrx/build_mod/kcl_pci.c
116 @@ -31,7 +31,11 @@
117 */
118
119 #include <linux/version.h>
120 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
121 +#include <generated/autoconf.h>
122 +#else
123 #include <linux/autoconf.h>
124 +#endif
125 #include <linux/pci.h>
126
127 #include "kcl_config.h"
128 --- work.orig/common/lib/modules/fglrx/build_mod/kcl_str.c
129 +++ work/common/lib/modules/fglrx/build_mod/kcl_str.c
130 @@ -30,7 +30,12 @@
131 *
132 */
133
134 +#include <linux/version.h>
135 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
136 +#include <generated/autoconf.h>
137 +#else
138 #include <linux/autoconf.h>
139 +#endif
140 #include <linux/string.h>
141 #include <linux/module.h>
142
143 --- work.orig/common/lib/modules/fglrx/build_mod/kcl_wait.c
144 +++ work/common/lib/modules/fglrx/build_mod/kcl_wait.c
145 @@ -31,7 +31,11 @@
146 */
147
148 #include <linux/version.h>
149 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
150 +#include <generated/autoconf.h>
151 +#else
152 #include <linux/autoconf.h>
153 +#endif
154 #include <linux/wait.h>
155 #include <linux/highmem.h>
156 #include <linux/sched.h>
157
158
159
160 1.1 x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
161
162 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch?rev=1.1&view=markup
163 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch?rev=1.1&content-type=text/plain
164
165 Index: ati-drivers-fix_compilation-bug-297322.patch
166 ===================================================================
167 --- common/lib/modules/fglrx/build_mod/firegl_public.c
168 +++ common/lib/modules/fglrx/build_mod/firegl_public.c
169 @@ -1441,7 +1441,9 @@
170 todo !!!
171 #endif
172
173 -unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
174 +void __cmpxchg_wrong_size(void) {}
175 +
176 +unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
177 unsigned long new, int size)
178 {
179 #ifndef __HAVE_ARCH_CMPXCHG
180 --- common/lib/modules/fglrx/build_mod/firegl_public.h
181 +++ common/lib/modules/fglrx/build_mod/firegl_public.h
182 @@ -441,7 +441,8 @@
183 extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
184 extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
185
186 -extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
187 +extern void __cmpxchg_wrong_size(void);
188 +extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
189 unsigned long new, int size);
190
191 #define __ke_cmpxchg(ptr,o,n) \