Adding patch to finally fix bug #239248, thanks to Rodolphe Rocca and

Thomas S. Howard.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)
 (Unsigned Manifest commit)

2 files changed, 100 insertions, 2 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 511cdacbc10d..c1e1bd3e23a9 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -9,6 +9,7 @@ AUX 8.455.2/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a55
 AUX 8.471.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX 8.476/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX 8.532/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
+AUX 8.542/ati-drivers-2.6.27.patch 2930 RMD160 a6c51cc1c9096bfc0453477c195aa54881867995 SHA1 8b229af3a1b0fc625605336f5c8985be72b4360f SHA256 b1130d675b93c7a9dc9c014157ee4ead16d375fd73ee02f6a620018111642e26
 AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6
 AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8
 AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01
@@ -65,6 +66,6 @@ EBUILD ati-drivers-8.501.ebuild 14695 RMD160 fc63e439ab6c03e1bb9a357cce97a974ffc
 EBUILD ati-drivers-8.512.ebuild 14696 RMD160 e46c66abef426492a96dd54d89d13b37e765087b SHA1 16180c0a2a4e14114423894075f34f8d1e65f280 SHA256 44f25dbd9910872b89b1c4ce21ab146cb6509f3c066a012f7d7ca479afc0a493
 EBUILD ati-drivers-8.522.ebuild 14696 RMD160 04783c90ee9b1d6ae19240dc9928a526200dbbc2 SHA1 b757225200d2b3fdd6fc02083c2e6044025198ed SHA256 390cb5a71b1f6ee93948e6e1a41a44c1b510d4757fe71a4260bb238c38103490
 EBUILD ati-drivers-8.532.ebuild 14874 RMD160 c770385d85e6502fc9257bec281e8d4ca06ebf06 SHA1 5b4c537065105fe77fe9eb2653257351c996a8ec SHA256 657325d3a2b4865aa3ff7aac3272ea8625e7f5a8cb5a94b47d2b955b6895adf1
-EBUILD ati-drivers-8.542.ebuild 14875 RMD160 9d1e6085ebae5e4b011fd91812d33f4f1cb1a657 SHA1 101791365251c5e9c4e11502cf95fbc8a4819771 SHA256 c1a99bd24b57d1dc8d2c66fd149258a494c58cd7391410acef5e983b5dfbc4ba
-MISC ChangeLog 47751 RMD160 f23fe8d020d12428cca8650d8fc5d28a90db1924 SHA1 850e66e58a0fba6fa22b217e1e04f1542762a4d2 SHA256 22e0ea4ab80cd836afbfcc77236d0f8b1e7f71f8f98adeb99fd17a9858645d94
+EBUILD ati-drivers-8.542.ebuild 14962 RMD160 2a443f81bafb90beede528dcc31b7f7b0c0543fc SHA1 12b4803be341fbeaad9d2dcf1c4d12f9ba131d09 SHA256 b007a59bc66e696c7e2a1fd3f4754eb72c831ec1d6a73d688637084606691569
+MISC ChangeLog 47959 RMD160 794d4c9034607500c34243681f4ec1a4c2c2e247 SHA1 88304710ca41888e930d46811eb3a489d8225701 SHA256 16f0ec856dbd78535b3cf08744cc12bc9e691b37eaa50dcbe40d5921fea6cf5e
 MISC metadata.xml 294 RMD160 ce6129af48ca9c259fa89b297249a558c58657a2 SHA1 f17731063fe83ac4b733ec2127b2dcf1017a7095 SHA256 5db182fb2524bf0627a165b0fc4fbdb17b9e1668a49428ec68c9c6ac13a02eea
diff --git a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch b/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch
new file mode 100644
index 000000000000..2a2a4f2cb753
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch
@@ -0,0 +1,97 @@
+--- firegl_public.c	2008-09-19 10:57:09.000000000 +0200
++++ firegl_public.c	2008-09-19 10:55:57.000000000 +0200
+@@ -199,6 +199,12 @@
+ #define preempt_enable()
+ #endif
+ 
++/* Since 2.6.27 smp_call_function doesn't have a nonatomic/retry argument */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, wait)
++#else
++#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, retry, wait)
++#endif
+ // ============================================================
+ /* globals */
+ 
+@@ -250,7 +256,7 @@
+ const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED;
+ #endif
+ 
+-#ifdef __SMP__
++#ifdef CONFIG_SMP
+ const unsigned long __ke_SMP_State = 1;
+ const char BUILD_KERNEL_HAS_SMP_SET;
+ #else
+@@ -2516,8 +2522,8 @@
+ {
+ /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel.
+   Define a simple version here.*/
+-#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
+-    on_each_cpu(KCL_flush_tlb_one, &va, 1, 1);
++#if defined(__x86_64__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
++    on_each_cpu(KCL_flush_tlb_one, &va, 1);
+ #else
+     flush_tlb_page(vma, va);
+ #endif
+@@ -2902,7 +2908,7 @@
+ 
+ /*****************************************************************************/
+ 
+-#ifdef __SMP__
++#ifdef CONFIG_SMP
+ static atomic_t cpus_waiting;
+ 
+ static void deferred_flush(void* contextp)
+@@ -2918,13 +2924,13 @@
+ 	while (atomic_read(&cpus_waiting) > 0)
+ 		barrier();
+ }
+-#endif /* __SMP__ */
++#endif /* CONFIG_SMP */
+ 
+ int ATI_API_CALL __ke_flush_cache(void)
+ {
+-#ifdef __SMP__
++#ifdef CONFIG_SMP
+     /* write back invalidate all other CPUs (exported by kernel) */
+-	if (smp_call_function(deferred_flush, NULL, 1, 0) != 0)
++	if (SMP_CALL_FUNCTION(deferred_flush, NULL, 1, 0) != 0)
+ 		panic("timed out waiting for the other CPUs!\n");
+ 
+     /* invalidate this CPU */
+@@ -2938,7 +2944,7 @@
+ 
+ 	while (atomic_read(&cpus_waiting) > 0)
+ 		barrier();
+-#else /* !__SMP__ */
++#else /* !CONFIG_SMP */
+ #if defined(__i386__) || defined(__x86_64__)
+ 	asm volatile ("wbinvd":::"memory");
+ #elif defined(__alpha__) || defined(__sparc__)
+@@ -2946,7 +2952,7 @@
+ #else
+ #error "Please define flush_cache for your architecture."
+ #endif
+-#endif /* !__SMP__ */
++#endif /* !CONFIG_SMP */
+ 
+     //for kernel 2.6.25, tlb_flush has been included when calling set_pages_*.
+     #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+@@ -4654,7 +4660,7 @@
+    }
+ 
+ #ifdef CONFIG_SMP
+-   if (smp_call_function(KCL_setup_pat, NULL, 0, 1) != 0)
++   if (SMP_CALL_FUNCTION(KCL_setup_pat, NULL, 0, 1) != 0)
+        return 0;
+ #endif
+    KCL_setup_pat(NULL);
+@@ -4673,7 +4679,7 @@
+     }
+ 
+ #ifdef CONFIG_SMP
+-    if (smp_call_function(KCL_restore_pat, NULL, 0, 1) != 0)
++    if (SMP_CALL_FUNCTION(KCL_restore_pat, NULL, 0, 1) != 0)
+        return;
+ #endif
+     KCL_restore_pat(NULL);