[Pkg-fglrx-devel] r424 - in fglrx-driver/trunk/debian: . patches

Patrick Matthäi pmatthaei at alioth.debian.org
Thu Jun 17 08:54:56 UTC 2010


Author: pmatthaei
Date: 2010-06-17 08:54:55 +0000 (Thu, 17 Jun 2010)
New Revision: 424

Removed:
   fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
- Drop patch 05_fix_cmpxchg.diff, merged by upstream.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-06-17 08:54:08 UTC (rev 423)
+++ fglrx-driver/trunk/debian/changelog	2010-06-17 08:54:55 UTC (rev 424)
@@ -2,10 +2,11 @@
 
   * New upstream release.
     - Refresh 01-CONFIG_X86_XEN.diff.
+    - Drop patch 05_fix_cmpxchg.diff, merged by upstream.
   * Add danish translation from Joe Dalton.
     Closes: #584290
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 17 Jun 2010 10:53:37 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 17 Jun 2010 10:54:26 +0200
 
 fglrx-driver (1:10-5-1) unstable; urgency=low
 

Deleted: fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff	2010-06-17 08:54:08 UTC (rev 423)
+++ fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff	2010-06-17 08:54:55 UTC (rev 424)
@@ -1,219 +0,0 @@
-# Fix broken usage of internal macro; fixes compiling with 2.6.33
-
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/drmP.h fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/drmP.h
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/drmP.h	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/drmP.h	2010-04-29 19:18:17.000000000 +0200
-@@ -42,7 +42,12 @@
-  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
-@@ -51,7 +56,6 @@
- #include <linux/init.h>
- #include <linux/file.h>
- #include <linux/pci.h>
--#include <linux/version.h>
- #include <linux/sched.h>
- #include <linux/smp_lock.h>	/* For (un)lock_kernel */
- #include <linux/mm.h>
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-29 19:16:30.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-04-29 19:18:17.000000000 +0200
-@@ -28,7 +28,11 @@
- #error Kernel versions older than 2.6.0 are no longer supported by this module.
- #endif 
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
-@@ -165,8 +169,12 @@
- 
- //  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
- #ifndef UTS_RELEASE 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/utsrelease.h>
-+#else
- #include <linux/utsrelease.h>
- #endif
-+#endif
- 
- #if defined(__i386__)
- #ifndef do_div
-@@ -1472,7 +1480,16 @@
- #ifndef __HAVE_ARCH_CMPXCHG
-     return __fgl_cmpxchg(ptr,old,new,size);
- #else
--    return __cmpxchg(ptr,old,new,size);
-+    switch (size) {
-+    case 1: { volatile u8 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+    case 2: { volatile u16 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+    case 4: { volatile u32 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+#ifdef __x86_64__
-+    case 8: { volatile u64 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+#endif
-+    default:
-+        return old;
-+    }
- #endif
- }
- 
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_acpi.c	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2010-04-29 19:18:17.000000000 +0200
-@@ -15,7 +15,11 @@
-  ****************************************************************************/
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/acpi.h>
- #include <linux/pci.h>
- 
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_agp.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_agp.c
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_agp.c	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_agp.c	2010-04-29 19:18:17.000000000 +0200
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- #include <linux/agp_backend.h>
- #include <linux/string.h>
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_io.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_io.c
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_io.c	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_io.c	2010-04-29 19:18:17.000000000 +0200
-@@ -37,7 +37,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/poll.h>
- #include <linux/signal.h>
- #include <asm/io.h>
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_osconfig.h fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-04-29 19:18:17.000000000 +0200
-@@ -20,7 +20,11 @@
- #define KCL_OSCONFIG_H
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
- #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_pci.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_pci.c
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_pci.c	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_pci.c	2010-04-29 19:18:17.000000000 +0200
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- 
- #include "kcl_config.h"
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_str.c
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_str.c	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_str.c	2010-04-29 19:18:17.000000000 +0200
-@@ -30,7 +30,12 @@
-  *
-  */
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/string.h>
- #include <linux/module.h>
- 
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_wait.c fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-04-29 19:18:17.000000000 +0200
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
-diff -Naur fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/make.sh fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/make.sh
---- fglrx-driver-10-4.orig//common/lib/modules/fglrx/build_mod/make.sh	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/lib/modules/fglrx/build_mod/make.sh	2010-04-29 19:18:17.000000000 +0200
-@@ -218,8 +218,15 @@
-         # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
-         kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
-     else
--        # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
--        kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
-+        UTS_REL_COUNT=`cat $linuxincludes/generated/utsrelease.h 2>/dev/null | grep UTS_RELEASE -c`
-+
-+	if [ $UTS_REL_COUNT -gt 0 ]; then
-+	    # 2.6.33+
-+	    kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
-+	else
-+            # For 2.6.18 to 2.6.32, UTS-define is defined in utsrelease.h.
-+            kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
-+	fi
-     fi
-   fi
- fi
-@@ -302,7 +309,8 @@
- # 3
- # linux/autoconf.h may contain this: #define CONFIG_SMP 1
- 
--src_file=$linuxincludes/linux/autoconf.h
-+src_file=$linuxincludes/generated/autoconf.h
-+[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
- 
- if [ ! -e $src_file ]; then
-   echo "Warning:"                                                  >> $logfile
-@@ -355,7 +363,8 @@
- MODVERSIONS=0
- 
- # linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
--src_file=$linuxincludes/linux/autoconf.h
-+src_file=$linuxincludes/generated/autoconf.h
-+[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
- if [ ! -e $src_file ];
- then
-   echo "Warning:"                                                  >> $logfile

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2010-06-17 08:54:08 UTC (rev 423)
+++ fglrx-driver/trunk/debian/patches/series	2010-06-17 08:54:55 UTC (rev 424)
@@ -1,4 +1,3 @@
 01-CONFIG_X86_XEN.diff
 03-authatieventsd.sh.diff
-05_fix_cmpxchg.diff
 06-build-with-2.6.34.diff




More information about the Pkg-fglrx-devel mailing list