SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/catalyst/stuff/catalyst-2.6.33.4.patch	Fri Sep 17 02:20:38 2010 +0000
     1.3 @@ -0,0 +1,228 @@
     1.4 +Index: ati10.1/common/lib/modules/fglrx/build_mod/drmP.h
     1.5 +===================================================================
     1.6 +--- ati10.1/common/lib/modules/fglrx/build_mod/drmP.h
     1.7 ++++ ati10.1/common/lib/modules/fglrx/build_mod/drmP.h	2010-01-28 19:57:07.562644291 +0200
     1.8 +@@ -42,7 +42,12 @@
     1.9 +  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
    1.10 + #include <asm/current.h>
    1.11 + #endif /* __alpha__ */
    1.12 ++#include <linux/version.h>
    1.13 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
    1.14 ++#include <generated/autoconf.h>
    1.15 ++#else
    1.16 + #include <generated/autoconf.h>
    1.17 ++#endif
    1.18 + #include <linux/module.h>
    1.19 + #include <linux/kernel.h>
    1.20 + #include <linux/miscdevice.h>
    1.21 +@@ -51,7 +56,6 @@
    1.22 + #include <linux/init.h>
    1.23 + #include <linux/file.h>
    1.24 + #include <linux/pci.h>
    1.25 +-#include <linux/version.h>
    1.26 + #include <linux/sched.h>
    1.27 + #include <linux/smp_lock.h>	/* For (un)lock_kernel */
    1.28 + #include <linux/mm.h>
    1.29 +Index: ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c
    1.30 +===================================================================
    1.31 +--- ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c
    1.32 ++++ ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-01-29 14:21:58.687999115 +0200
    1.33 +@@ -28,7 +28,11 @@
    1.34 + #error Kernel versions older than 2.6.0 are no longer supported by this module.
    1.35 + #endif 
    1.36 + 
    1.37 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
    1.38 ++#include <generated/autoconf.h>
    1.39 ++#else
    1.40 + #include <generated/autoconf.h>
    1.41 ++#endif
    1.42 + 
    1.43 + #if !defined(CONFIG_X86) 
    1.44 + #if !defined(CONFIG_X86_PC) 
    1.45 +@@ -163,8 +167,12 @@
    1.46 + 
    1.47 + //  For 2.6.18 or higher, the UTS_RELEASE is defined in the generated/utsrelease.h. 
    1.48 + #ifndef UTS_RELEASE 
    1.49 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
    1.50 ++#include <generated/utsrelease.h>
    1.51 ++#else
    1.52 + #include <generated/utsrelease.h>
    1.53 + #endif
    1.54 ++#endif
    1.55 + 
    1.56 + #if defined(__i386__)
    1.57 + #ifndef do_div
    1.58 +@@ -1472,7 +1472,16 @@
    1.59 + #ifndef __HAVE_ARCH_CMPXCHG
    1.60 +     return __fgl_cmpxchg(ptr,old,new,size);
    1.61 + #else
    1.62 +-    return __cmpxchg(ptr,old,new,size);
    1.63 ++    switch (size) {
    1.64 ++    case 1: { volatile u8 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
    1.65 ++    case 2: { volatile u16 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
    1.66 ++    case 4: { volatile u32 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
    1.67 ++#ifdef __x86_64__
    1.68 ++    case 8: { volatile u64 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
    1.69 ++#endif
    1.70 ++    default:
    1.71 ++        return old;
    1.72 ++    }
    1.73 + #endif
    1.74 + }
    1.75 +
    1.76 + 
    1.77 +Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
    1.78 +===================================================================
    1.79 +--- ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
    1.80 ++++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2010-01-28 19:57:17.897225045 +0200
    1.81 +@@ -15,7 +15,11 @@
    1.82 +  ****************************************************************************/
    1.83 + 
    1.84 + #include <linux/version.h>
    1.85 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
    1.86 ++#include <generated/autoconf.h>
    1.87 ++#else
    1.88 + #include <generated/autoconf.h>
    1.89 ++#endif
    1.90 + #include <linux/acpi.h>
    1.91 + 
    1.92 + #include "kcl_config.h"
    1.93 +Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
    1.94 +===================================================================
    1.95 +--- ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
    1.96 ++++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c	2010-01-28 19:57:26.104892082 +0200
    1.97 +@@ -31,7 +31,11 @@
    1.98 +  */
    1.99 + 
   1.100 + #include <linux/version.h>
   1.101 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
   1.102 ++#include <generated/autoconf.h>
   1.103 ++#else
   1.104 + #include <generated/autoconf.h>
   1.105 ++#endif
   1.106 + #include <linux/pci.h>
   1.107 + #include <linux/agp_backend.h>
   1.108 + #include <linux/string.h>
   1.109 +Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c
   1.110 +===================================================================
   1.111 +--- ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c
   1.112 ++++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c	2010-01-28 19:57:34.337558105 +0200
   1.113 +@@ -37,7 +37,11 @@
   1.114 +  */
   1.115 + 
   1.116 + #include <linux/version.h>
   1.117 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
   1.118 ++#include <generated/autoconf.h>
   1.119 ++#else
   1.120 + #include <generated/autoconf.h>
   1.121 ++#endif
   1.122 + #include <linux/poll.h>
   1.123 + #include <linux/signal.h>
   1.124 + #include <asm/io.h>
   1.125 +Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
   1.126 +===================================================================
   1.127 +--- ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
   1.128 ++++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-01-28 19:57:43.599182385 +0200
   1.129 +@@ -20,7 +20,11 @@
   1.130 + #define KCL_OSCONFIG_H
   1.131 + 
   1.132 + #include <linux/version.h>
   1.133 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
   1.134 ++#include <generated/autoconf.h>
   1.135 ++#else
   1.136 + #include <generated/autoconf.h>
   1.137 ++#endif
   1.138 + 
   1.139 + // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
   1.140 + #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
   1.141 +Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c
   1.142 +===================================================================
   1.143 +--- ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c
   1.144 ++++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c	2010-01-28 19:57:51.295870149 +0200
   1.145 +@@ -31,7 +31,11 @@
   1.146 +  */
   1.147 + 
   1.148 + #include <linux/version.h>
   1.149 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
   1.150 ++#include <generated/autoconf.h>
   1.151 ++#else
   1.152 + #include <generated/autoconf.h>
   1.153 ++#endif
   1.154 + #include <linux/pci.h>
   1.155 + 
   1.156 + #include "kcl_config.h"
   1.157 +Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c
   1.158 +===================================================================
   1.159 +--- ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c
   1.160 ++++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c	2010-01-28 19:57:59.728528058 +0200
   1.161 +@@ -30,7 +30,12 @@
   1.162 +  *
   1.163 +  */
   1.164 + 
   1.165 ++#include <linux/version.h>
   1.166 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
   1.167 ++#include <generated/autoconf.h>
   1.168 ++#else
   1.169 + #include <generated/autoconf.h>
   1.170 ++#endif
   1.171 + #include <linux/string.h>
   1.172 + #include <linux/module.h>
   1.173 + 
   1.174 +Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c
   1.175 +===================================================================
   1.176 +--- ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c
   1.177 ++++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-01-28 19:58:08.936154527 +0200
   1.178 +@@ -31,7 +31,11 @@
   1.179 +  */
   1.180 + 
   1.181 + #include <linux/version.h>
   1.182 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
   1.183 ++#include <generated/autoconf.h>
   1.184 ++#else
   1.185 + #include <generated/autoconf.h>
   1.186 ++#endif
   1.187 + #include <linux/wait.h>
   1.188 + #include <linux/highmem.h>
   1.189 + #include <linux/sched.h>
   1.190 +Index: ati10.1/common/lib/modules/fglrx/build_mod/make.sh
   1.191 +===================================================================
   1.192 +--- ati10.1/common/lib/modules/fglrx/build_mod/make.sh
   1.193 ++++ ati10.1/common/lib/modules/fglrx/build_mod/make.sh	2010-01-28 19:55:10.849378991 +0200
   1.194 +@@ -218,8 +218,15 @@
   1.195 +         # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
   1.196 +         kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
   1.197 +     else
   1.198 +-        # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
   1.199 +-        kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
   1.200 ++        UTS_REL_COUNT=`cat $linuxincludes/generated/utsrelease.h 2>/dev/null | grep UTS_RELEASE -c`
   1.201 ++
   1.202 ++	if [ $UTS_REL_COUNT -gt 0 ]; then
   1.203 ++	    # 2.6.33+
   1.204 ++	    kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
   1.205 ++	else
   1.206 ++            # For 2.6.18 to 2.6.32, UTS-define is defined in utsrelease.h.
   1.207 ++            kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
   1.208 ++	fi
   1.209 +     fi
   1.210 +   fi
   1.211 + fi
   1.212 +@@ -302,7 +309,8 @@
   1.213 + # 3
   1.214 + # generated/autoconf.h may contain this: #define CONFIG_SMP 1
   1.215 + 
   1.216 +-src_file=$linuxincludes/generated/autoconf.h
   1.217 ++src_file=$linuxincludes/generated/autoconf.h
   1.218 ++[ -e $src_file ] || src_file=$linuxincludes/generated/autoconf.h
   1.219 + 
   1.220 + if [ ! -e $src_file ]; then
   1.221 +   echo "Warning:"                                                  >> $logfile
   1.222 +@@ -355,7 +363,8 @@
   1.223 + MODVERSIONS=0
   1.224 + 
   1.225 + # generated/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
   1.226 +-src_file=$linuxincludes/generated/autoconf.h
   1.227 ++src_file=$linuxincludes/generated/autoconf.h
   1.228 ++[ -e $src_file ] || src_file=$linuxincludes/generated/autoconf.h
   1.229 + if [ ! -e $src_file ];
   1.230 + then
   1.231 +   echo "Warning:"                                                  >> $logfile