mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 02:51:18 +00:00
e0000f8ad1
This update is mostly effort from @MarcWeber and @vcunat, now tested on real hardware making sure it works with multiple GPUs and opencl.
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
|
index d3ad3ce..9362b58 100755
|
|
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
|
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
|
@@ -34,6 +34,11 @@
|
|
#include <linux/autoconf.h>
|
|
#endif
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
|
|
+#include <linux/uidgid.h>
|
|
+#endif
|
|
+
|
|
+
|
|
#if !defined(CONFIG_X86)
|
|
#if !defined(CONFIG_X86_PC)
|
|
#if !defined(CONFIG_X86_XEN)
|
|
@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void)
|
|
KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
|
|
{
|
|
#ifdef current_euid
|
|
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
|
|
+ return __kuid_val(current_euid());
|
|
+# else
|
|
return current_euid();
|
|
+# endif
|
|
#else
|
|
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
|
|
+ return __kuid_val(current->euid);
|
|
+# else
|
|
return current->euid;
|
|
+# endif
|
|
#endif
|
|
}
|
|
|
|
|
|
diff -urN a/common/lib/modules/fglrx/build_mod/kcl_acpi.c common/lib/modules/fglrx/build_mod/kcl_acpi.c
|
|
--- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:32:34.734832283 +0100
|
|
+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-27 13:33:31.849831765 +0100
|
|
@@ -1002,7 +1002,11 @@
|
|
#endif
|
|
{
|
|
return KCL_ACPI_ERROR;
|
|
- }
|
|
+ }
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
|
|
+ ((acpi_tbl_table_handler)handler)(hdr);
|
|
+#else
|
|
((acpi_table_handler)handler)(hdr);
|
|
+#endif
|
|
return KCL_ACPI_OK;
|
|
}
|