projects / fglrx-packaging.git / commitdiff
Build Results
 
Summary

Description: The git repository for the ATI/AMD fglrx packaging scripts.
Last Change: Thu 2/4/10 2:40

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Thu 2/4/10 2:39
Mario Limonciello  
Convert to alternatives... 
Thu 2/4/10 1:55
Mario Limonciello  
Drop old kdelnk file... 
Thu 2/4/10 0:49
Mario Limonciello  
Drop arch stuff for fglrx... 
Wed 2/3/10 1:56
Mario Limonciello  
Migrate over to dh7. No... 
Wed 2/3/10 1:22
Mario Limonciello  
Bump standard version for... 
Sat 1/30/10 16:05
Anssi Hannula  
Mandriva: adapt for... 
 
> --git a/Ubuntu/dists/source/dkms.conf.in b/Ubuntu/dists/source/dkms.conf.in
index 40ee80b
..cda0899 100644
--- a/Ubuntu/dists/source/dkms.conf.in
+++ b/Ubuntu/dists/source/dkms.conf.in
@@ -5,+5,@@ BUILT_MODULE_NAME[0]="fglrx"
 
MAKE[0]="pushd ${dkms_tree}/fglrx/#CVERSION#/build; sh make.sh --nohints --uname_r=$kernelver; popd"
 
DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm"
 
AUTOINSTALL="yes"
+PATCH[0]="fglrx-rt-compat.patch"
+PATCH_MATCH[0]="rt"
diff --git a/Ubuntu/dists/source/dkms/patches/patches/fglrx-rt-compat.patch b/Ubuntu/dists/source/dkms/patches/patches/fglrx-rt-compat.patch
new file mode 100644
index 0000000..9572691
--- /dev/null
+++ b/Ubuntu/dists/source/dkms/patches/patches/fglrx-rt-compat.patch
@@ -0,+1,26 @@
+--- 
a/firegl_public.c
++++ b/firegl_public.c
+@@ -1352,+1352,11 @@
+    
int process_terminated 1;
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++#if !defined(CONFIG_PREEMPT_RT)
+    rcu_read_lock();
++
#else
++   preempt_disable();
++
#endif
#else
+    read_lock(&tasklist_lock);
#endif
+@@ -1373,+1377,11 @@
+       }
+    }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++#if !defined(CONFIG_PREEMPT_RT)
+    rcu_read_unlock();
++
#else
++   preempt_disable();
++
#endif
#else
+    read_unlock(&tasklist_lock);
#endif
<
 
Phoronix.com
Linux Driver Forums
Copyright © 2010 by Phoronix Media