summarylogtreecommitdiffstats
path: root/4.2-ubuntu_buildfix_kernel_4.2-modified.patch
diff options
context:
space:
mode:
authorVi0L02015-12-13 22:07:16 +0100
committerVi0L02015-12-13 22:07:16 +0100
commit2b8bbee1a102ff47f11b3c8dac68fb6ecb53a846 (patch)
tree28039313f87ea4dc2c01f62edec0993822a190bc /4.2-ubuntu_buildfix_kernel_4.2-modified.patch
parent6ba2cb92eac8ae292a785c970f13f5b8ebe882e1 (diff)
downloadaur-2b8bbee1a102ff47f11b3c8dac68fb6ecb53a846.tar.gz
adding support for up to 4.3 linux kernel + adding custom ACPI files for events handling
Diffstat (limited to '4.2-ubuntu_buildfix_kernel_4.2-modified.patch')
-rw-r--r--4.2-ubuntu_buildfix_kernel_4.2-modified.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/4.2-ubuntu_buildfix_kernel_4.2-modified.patch b/4.2-ubuntu_buildfix_kernel_4.2-modified.patch
new file mode 100644
index 000000000000..60a82b7c1d1a
--- /dev/null
+++ b/4.2-ubuntu_buildfix_kernel_4.2-modified.patch
@@ -0,0 +1,67 @@
+--- 15.11/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-11-08 17:32:54.748514621 +0100
++++ 15.11b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-11-08 17:46:13.157284759 +0100
+@@ -190,9 +190,17 @@
+ #include <linux/string.h>
+ #include <linux/gfp.h>
+ #include <linux/swap.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+ #include "asm/i387.h"
++#else
++#include <asm/fpu/api.h>
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+ #include <asm/fpu-internal.h>
++#else
++#include <asm/fpu/internal.h>
++#endif
+ #endif
+
+ #include "firegl_public.h"
+@@ -1662,6 +1670,9 @@
+
+ #if defined(__i386__)
+ #ifndef __HAVE_ARCH_CMPXCHG
++#ifndef __xg
++#define __xg(x) ((volatile long *)(x))
++#endif
+ static inline
+ unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,
+ unsigned long new, int size)
+@@ -1698,7 +1709,11 @@
+ unsigned long new, int size)
+ {
+ #ifndef __HAVE_ARCH_CMPXCHG
++#if defined(__i386__)
+ return __fgl_cmpxchg(ptr,old,new,size);
++#elif defined(__x86_64__)
++ return cmpxchg((unsigned long*)ptr,old,new);
++#endif
+ #else
+ /* On kernel version 2.6.34 passing a variable or unsupported size
+ * argument to the __cmpxchg macro causes the default-clause of a
+@@ -6117,8 +6132,12 @@
+ void ATI_API_CALL KCL_fpu_begin(void)
+ {
+ #ifdef CONFIG_X86_64
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+ kernel_fpu_begin();
+ #else
++ __kernel_fpu_begin();
++#endif
++#else
+ #ifdef TS_USEDFPU
+ struct thread_info *cur_thread = current_thread_info();
+ struct task_struct *cur_task = get_current();
+@@ -6154,7 +6173,11 @@
+ */
+ void ATI_API_CALL KCL_fpu_end(void)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
+ kernel_fpu_end();
++#else
++ __kernel_fpu_end();
++#endif
+ }
+
+ #endif /* __KERNEL__ */