wok annotate catalyst/stuff/catalyst-2.6.33.4.patch @ rev 6317

Fixed typo in ghostscript.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Sep 17 02:20:38 2010 +0000 (2010-09-17)
parents
children
rev   line source
jozee@5614 1 Index: ati10.1/common/lib/modules/fglrx/build_mod/drmP.h
jozee@5614 2 ===================================================================
jozee@5614 3 --- ati10.1/common/lib/modules/fglrx/build_mod/drmP.h
jozee@5614 4 +++ ati10.1/common/lib/modules/fglrx/build_mod/drmP.h 2010-01-28 19:57:07.562644291 +0200
jozee@5614 5 @@ -42,7 +42,12 @@
jozee@5614 6 * can build the DRM (part of PI DRI). 4/21/2000 S + B */
jozee@5614 7 #include <asm/current.h>
jozee@5614 8 #endif /* __alpha__ */
jozee@5614 9 +#include <linux/version.h>
jozee@5614 10 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 11 +#include <generated/autoconf.h>
jozee@5614 12 +#else
jozee@5614 13 #include <generated/autoconf.h>
jozee@5614 14 +#endif
jozee@5614 15 #include <linux/module.h>
jozee@5614 16 #include <linux/kernel.h>
jozee@5614 17 #include <linux/miscdevice.h>
jozee@5614 18 @@ -51,7 +56,6 @@
jozee@5614 19 #include <linux/init.h>
jozee@5614 20 #include <linux/file.h>
jozee@5614 21 #include <linux/pci.h>
jozee@5614 22 -#include <linux/version.h>
jozee@5614 23 #include <linux/sched.h>
jozee@5614 24 #include <linux/smp_lock.h> /* For (un)lock_kernel */
jozee@5614 25 #include <linux/mm.h>
jozee@5614 26 Index: ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c
jozee@5614 27 ===================================================================
jozee@5614 28 --- ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c
jozee@5614 29 +++ ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-01-29 14:21:58.687999115 +0200
jozee@5614 30 @@ -28,7 +28,11 @@
jozee@5614 31 #error Kernel versions older than 2.6.0 are no longer supported by this module.
jozee@5614 32 #endif
jozee@5614 33
jozee@5614 34 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 35 +#include <generated/autoconf.h>
jozee@5614 36 +#else
jozee@5614 37 #include <generated/autoconf.h>
jozee@5614 38 +#endif
jozee@5614 39
jozee@5614 40 #if !defined(CONFIG_X86)
jozee@5614 41 #if !defined(CONFIG_X86_PC)
jozee@5614 42 @@ -163,8 +167,12 @@
jozee@5614 43
jozee@5614 44 // For 2.6.18 or higher, the UTS_RELEASE is defined in the generated/utsrelease.h.
jozee@5614 45 #ifndef UTS_RELEASE
jozee@5614 46 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 47 +#include <generated/utsrelease.h>
jozee@5614 48 +#else
jozee@5614 49 #include <generated/utsrelease.h>
jozee@5614 50 #endif
jozee@5614 51 +#endif
jozee@5614 52
jozee@5614 53 #if defined(__i386__)
jozee@5614 54 #ifndef do_div
jozee@5614 55 @@ -1472,7 +1472,16 @@
jozee@5614 56 #ifndef __HAVE_ARCH_CMPXCHG
jozee@5614 57 return __fgl_cmpxchg(ptr,old,new,size);
jozee@5614 58 #else
jozee@5614 59 - return __cmpxchg(ptr,old,new,size);
jozee@5614 60 + switch (size) {
jozee@5614 61 + case 1: { volatile u8 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
jozee@5614 62 + case 2: { volatile u16 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
jozee@5614 63 + case 4: { volatile u32 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
jozee@5614 64 +#ifdef __x86_64__
jozee@5614 65 + case 8: { volatile u64 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
jozee@5614 66 +#endif
jozee@5614 67 + default:
jozee@5614 68 + return old;
jozee@5614 69 + }
jozee@5614 70 #endif
jozee@5614 71 }
jozee@5614 72
jozee@5614 73
jozee@5614 74 Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
jozee@5614 75 ===================================================================
jozee@5614 76 --- ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
jozee@5614 77 +++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2010-01-28 19:57:17.897225045 +0200
jozee@5614 78 @@ -15,7 +15,11 @@
jozee@5614 79 ****************************************************************************/
jozee@5614 80
jozee@5614 81 #include <linux/version.h>
jozee@5614 82 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 83 +#include <generated/autoconf.h>
jozee@5614 84 +#else
jozee@5614 85 #include <generated/autoconf.h>
jozee@5614 86 +#endif
jozee@5614 87 #include <linux/acpi.h>
jozee@5614 88
jozee@5614 89 #include "kcl_config.h"
jozee@5614 90 Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
jozee@5614 91 ===================================================================
jozee@5614 92 --- ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
jozee@5614 93 +++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c 2010-01-28 19:57:26.104892082 +0200
jozee@5614 94 @@ -31,7 +31,11 @@
jozee@5614 95 */
jozee@5614 96
jozee@5614 97 #include <linux/version.h>
jozee@5614 98 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 99 +#include <generated/autoconf.h>
jozee@5614 100 +#else
jozee@5614 101 #include <generated/autoconf.h>
jozee@5614 102 +#endif
jozee@5614 103 #include <linux/pci.h>
jozee@5614 104 #include <linux/agp_backend.h>
jozee@5614 105 #include <linux/string.h>
jozee@5614 106 Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c
jozee@5614 107 ===================================================================
jozee@5614 108 --- ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c
jozee@5614 109 +++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c 2010-01-28 19:57:34.337558105 +0200
jozee@5614 110 @@ -37,7 +37,11 @@
jozee@5614 111 */
jozee@5614 112
jozee@5614 113 #include <linux/version.h>
jozee@5614 114 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 115 +#include <generated/autoconf.h>
jozee@5614 116 +#else
jozee@5614 117 #include <generated/autoconf.h>
jozee@5614 118 +#endif
jozee@5614 119 #include <linux/poll.h>
jozee@5614 120 #include <linux/signal.h>
jozee@5614 121 #include <asm/io.h>
jozee@5614 122 Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
jozee@5614 123 ===================================================================
jozee@5614 124 --- ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
jozee@5614 125 +++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h 2010-01-28 19:57:43.599182385 +0200
jozee@5614 126 @@ -20,7 +20,11 @@
jozee@5614 127 #define KCL_OSCONFIG_H
jozee@5614 128
jozee@5614 129 #include <linux/version.h>
jozee@5614 130 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 131 +#include <generated/autoconf.h>
jozee@5614 132 +#else
jozee@5614 133 #include <generated/autoconf.h>
jozee@5614 134 +#endif
jozee@5614 135
jozee@5614 136 // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
jozee@5614 137 #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
jozee@5614 138 Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c
jozee@5614 139 ===================================================================
jozee@5614 140 --- ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c
jozee@5614 141 +++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c 2010-01-28 19:57:51.295870149 +0200
jozee@5614 142 @@ -31,7 +31,11 @@
jozee@5614 143 */
jozee@5614 144
jozee@5614 145 #include <linux/version.h>
jozee@5614 146 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 147 +#include <generated/autoconf.h>
jozee@5614 148 +#else
jozee@5614 149 #include <generated/autoconf.h>
jozee@5614 150 +#endif
jozee@5614 151 #include <linux/pci.h>
jozee@5614 152
jozee@5614 153 #include "kcl_config.h"
jozee@5614 154 Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c
jozee@5614 155 ===================================================================
jozee@5614 156 --- ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c
jozee@5614 157 +++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c 2010-01-28 19:57:59.728528058 +0200
jozee@5614 158 @@ -30,7 +30,12 @@
jozee@5614 159 *
jozee@5614 160 */
jozee@5614 161
jozee@5614 162 +#include <linux/version.h>
jozee@5614 163 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 164 +#include <generated/autoconf.h>
jozee@5614 165 +#else
jozee@5614 166 #include <generated/autoconf.h>
jozee@5614 167 +#endif
jozee@5614 168 #include <linux/string.h>
jozee@5614 169 #include <linux/module.h>
jozee@5614 170
jozee@5614 171 Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c
jozee@5614 172 ===================================================================
jozee@5614 173 --- ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c
jozee@5614 174 +++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-01-28 19:58:08.936154527 +0200
jozee@5614 175 @@ -31,7 +31,11 @@
jozee@5614 176 */
jozee@5614 177
jozee@5614 178 #include <linux/version.h>
jozee@5614 179 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
jozee@5614 180 +#include <generated/autoconf.h>
jozee@5614 181 +#else
jozee@5614 182 #include <generated/autoconf.h>
jozee@5614 183 +#endif
jozee@5614 184 #include <linux/wait.h>
jozee@5614 185 #include <linux/highmem.h>
jozee@5614 186 #include <linux/sched.h>
jozee@5614 187 Index: ati10.1/common/lib/modules/fglrx/build_mod/make.sh
jozee@5614 188 ===================================================================
jozee@5614 189 --- ati10.1/common/lib/modules/fglrx/build_mod/make.sh
jozee@5614 190 +++ ati10.1/common/lib/modules/fglrx/build_mod/make.sh 2010-01-28 19:55:10.849378991 +0200
jozee@5614 191 @@ -218,8 +218,15 @@
jozee@5614 192 # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
jozee@5614 193 kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
jozee@5614 194 else
jozee@5614 195 - # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
jozee@5614 196 - kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
jozee@5614 197 + UTS_REL_COUNT=`cat $linuxincludes/generated/utsrelease.h 2>/dev/null | grep UTS_RELEASE -c`
jozee@5614 198 +
jozee@5614 199 + if [ $UTS_REL_COUNT -gt 0 ]; then
jozee@5614 200 + # 2.6.33+
jozee@5614 201 + kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
jozee@5614 202 + else
jozee@5614 203 + # For 2.6.18 to 2.6.32, UTS-define is defined in utsrelease.h.
jozee@5614 204 + kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
jozee@5614 205 + fi
jozee@5614 206 fi
jozee@5614 207 fi
jozee@5614 208 fi
jozee@5614 209 @@ -302,7 +309,8 @@
jozee@5614 210 # 3
jozee@5614 211 # generated/autoconf.h may contain this: #define CONFIG_SMP 1
jozee@5614 212
jozee@5614 213 -src_file=$linuxincludes/generated/autoconf.h
jozee@5614 214 +src_file=$linuxincludes/generated/autoconf.h
jozee@5614 215 +[ -e $src_file ] || src_file=$linuxincludes/generated/autoconf.h
jozee@5614 216
jozee@5614 217 if [ ! -e $src_file ]; then
jozee@5614 218 echo "Warning:" >> $logfile
jozee@5614 219 @@ -355,7 +363,8 @@
jozee@5614 220 MODVERSIONS=0
jozee@5614 221
jozee@5614 222 # generated/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
jozee@5614 223 -src_file=$linuxincludes/generated/autoconf.h
jozee@5614 224 +src_file=$linuxincludes/generated/autoconf.h
jozee@5614 225 +[ -e $src_file ] || src_file=$linuxincludes/generated/autoconf.h
jozee@5614 226 if [ ! -e $src_file ];
jozee@5614 227 then
jozee@5614 228 echo "Warning:" >> $logfile