SOURCES: xorg-driver-video-fglrx-smp.patch - one more fix.

[pluto]

Author: pluto                        Date: Sat Feb 21 11:21:59 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- one more fix.

---- Files affected:
SOURCES:
   xorg-driver-video-fglrx-smp.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/xorg-driver-video-fglrx-smp.patch
diff -u SOURCES/xorg-driver-video-fglrx-smp.patch:1.3 SOURCES/xorg-driver-video-fglrx-smp.patch:1.4
--- SOURCES/xorg-driver-video-fglrx-smp.patch:1.3	Tue Dec 16 22:28:38 2008
+++ SOURCES/xorg-driver-video-fglrx-smp.patch	Sat Feb 21 12:21:54 2009
@@ -1,6 +1,6 @@
 --- lib/modules/fglrx/build_mod/firegl_public.c.orig	2008-12-04 23:56:18.000000000 +0100
 +++ lib/modules/fglrx/build_mod/firegl_public.c	2008-12-16 10:38:36.413113059 +0100
-@@ -241,7 +241,7 @@
+@@ -245,7 +245,7 @@
  const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED;
  #endif
  
@@ -9,7 +9,16 @@
  const unsigned long KCL_SYSINFO_SmpSupport = 1;
  const char BUILD_KERNEL_HAS_SMP_SET;
  #else
-@@ -2499,7 +2499,7 @@
+@@ -2256,7 +2256,7 @@
+  * kernel <  2.6.27, on_each_cpu has 4 parameters.
+  * kernel >= 2.6.27, on_each_cpu has 3 parameters (removed the "retry" parameter)
+  */
+-#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
++#if defined(__x86_64__) && defined(CONFIG_SMP) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
+ #   if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+         on_each_cpu(KCL_flush_tlb_one, &va, 1, 1);
+ #   else
+@@ -2503,7 +2503,7 @@
  
  /*****************************************************************************/
  
@@ -18,7 +27,7 @@
  static atomic_t cpus_waiting;
  
  static void deferred_flush(void* contextp)
-@@ -2515,7 +2515,7 @@
+@@ -2519,7 +2519,7 @@
  	while (atomic_read(&cpus_waiting) > 0)
  		barrier();
  }
@@ -27,7 +36,7 @@
  
  /** \brief Run a function on all other CPUs.
   * \param func The function to run.
-@@ -2531,7 +2531,7 @@
+@@ -2535,7 +2535,7 @@
  
  int ATI_API_CALL KCL_MEM_FlushCpuCaches(void)
  {
@@ -36,7 +45,7 @@
      /* write back invalidate all other CPUs (exported by kernel) */
  	if (KCL_SmpCallFunction(deferred_flush, NULL, 1, 0) != 0)
  		panic("timed out waiting for the other CPUs!\n");
-@@ -2547,7 +2547,7 @@
+@@ -2551,7 +2551,7 @@
  
  	while (atomic_read(&cpus_waiting) > 0)
  		barrier();
@@ -45,7 +54,7 @@
  #if defined(__i386__) || defined(__x86_64__)
  	asm volatile ("wbinvd":::"memory");
  #elif defined(__alpha__) || defined(__sparc__)
-@@ -2555,7 +2555,7 @@
+@@ -2559,7 +2559,7 @@
  #else
  #error "Please define flush_cache for your architecture."
  #endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-driver-video-fglrx-smp.patch?r1=1.3&r2=1.4&f=u