[Pkg-fglrx-devel] r1398 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2014-09-17 08:58:21 +0000 (Wed, 17 Sep 2014)
New Revision: 1398

Removed:
   fglrx-driver/trunk/debian/patches/linux3.14.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
- Drop merged linux3.14 patch.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-09-17 08:57:14 UTC (rev 1397)
+++ fglrx-driver/trunk/debian/changelog	2014-09-17 08:58:21 UTC (rev 1398)
@@ -11,6 +11,7 @@
     Closes: #757496
   * New upstream release provided by AMD with xserver 1.16 support. The full
     release name is 14.4.2+GA14.201.1006.1002.
+    - Drop merged linux3.14 patch.
     - Provide xorg-video-abi-18.
       Closes: #754249
 

Deleted: fglrx-driver/trunk/debian/patches/linux3.14.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/linux3.14.patch	2014-09-17 08:57:14 UTC (rev 1397)
+++ fglrx-driver/trunk/debian/patches/linux3.14.patch	2014-09-17 08:58:21 UTC (rev 1398)
@@ -1,23 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1779,17 +1779,14 @@
-  */
- KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
- {
--#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+#if defined(CONFIG_UIDGID_STRICT_TYPE_CHECKS) \
-+	|| LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
-     return __kuid_val(current_euid());
--#else 
--
--#ifdef current_euid
-+#elif defined(current_euid)
-     return current_euid();
- #else
-     return current->euid;
- #endif
--
--#endif
- }
- 
- /** /brief Delay execution for the specified number of microseconds

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2014-09-17 08:57:14 UTC (rev 1397)
+++ fglrx-driver/trunk/debian/patches/series	2014-09-17 08:58:21 UTC (rev 1398)
@@ -1,4 +1,3 @@
 02-dkms-arch_compat.patch
 03-authatieventsd.sh.patch
 06-stub-for-agpless-kernel.patch
-linux3.14.patch