# Second patch from Ubuntu for Linux 4.2.

diff -Nurp fglrx-15.302.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-15.302/common/lib/modules/fglrx/build_mod/firegl_public.c
--- fglrx-15.302.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2016-03-07 23:15:37.174858690 +0200
+++ fglrx-15.302/common/lib/modules/fglrx/build_mod/firegl_public.c	2016-03-07 23:20:57.219974006 +0200
@@ -6452,6 +6452,48 @@ int ATI_API_CALL kcl_sscanf(const char *
     return i;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
+/*
+ * Save processor xstate to xsave area.
+ */
+static void _copy_xregs_to_kernel(struct xregs_state *xstate)
+{
+        u64 mask = -1;
+        u32 lmask = mask;
+        u32 hmask = mask >> 32;
+        int err = 0;
+
+        /*WARN_ON(!alternatives_patched);*/
+
+        /*
+         * If xsaves is enabled, xsaves replaces xsaveopt because
+         * it supports compact format and supervisor states in addition to
+         * modified optimization in xsaveopt.
+         *
+         * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave
+         * because xsaveopt supports modified optimization which is not
+         * supported by xsave.
+         *
+         * If none of xsaves and xsaveopt is enabled, use xsave.
+         */
+        alternative_input_2(
+                "1:"XSAVE,
+                XSAVEOPT,
+                X86_FEATURE_XSAVEOPT,
+                XSAVES,
+                X86_FEATURE_XSAVES,
+                [xstate] "D" (xstate), "a" (lmask), "d" (hmask) :
+                "memory");
+        asm volatile("2:\n\t"
+                     xstate_fault(err)
+                     : "0" (err)
+                     : "memory");
+
+        /* We should never fault when copying to a kernel buffer: */
+        WARN_ON_FPU(err);
+}
+#endif
+
 /** \brief Generate UUID
  *  \param buf pointer to the generated UUID
  *  \return None
@@ -6471,7 +6513,7 @@ static int KCL_fpu_save_init(struct task
       fpu_xsave(fpu);
       if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
 #else
-	  copy_xregs_to_kernel(&fpu->state.xsave);
+	 _copy_xregs_to_kernel(&fpu->state.xsave);
       if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
 #endif
          return 1;