From 25356fb7b9b7bd3b067a8007e74807acd595ee09 Mon Sep 17 00:00:00 2001
From: tnut <tnut at nutyx dot com>
Date: Tue, 6 Mar 2012 07:24:50 +0100
Subject: kernel, maj 3.2.9-1

---
 kernel/3.2.8.patch | 21 +++++++++++++++++++++
 kernel/Pkgfile     | 15 ++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 kernel/3.2.8.patch

(limited to 'kernel')

diff --git a/kernel/3.2.8.patch b/kernel/3.2.8.patch
new file mode 100644
index 000000000..381250214
--- /dev/null
+++ b/kernel/3.2.8.patch
@@ -0,0 +1,21 @@
+Signed-off-by: Gianluca Gennari <gennarone@gmail.com>
+---
+--- 12.1/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ 12.1/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
+ #ifdef CONFIG_X86_64
+     kernel_fpu_begin();
+ #else
++#ifndef TS_USEDFPU
++    preempt_disable();
++    if (__thread_has_fpu(current))
++        __save_init_fpu(current);
++#else
+     struct thread_info *cur_task = current_thread_info();
+     preempt_disable();
+     if (cur_task->status & TS_USEDFPU)
+         __save_init_fpu(cur_task->task);
++#endif
+     else
+         clts();
+ #endif 
diff --git a/kernel/Pkgfile b/kernel/Pkgfile
index f6a7bc538..ae3be1a8a 100644
--- a/kernel/Pkgfile
+++ b/kernel/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com
 
 name=kernel
-version=3.2.7
+version=3.2.9
 _BaseVersion=3.2
 release=1
 PKGMK_NO_STRIP="yes"
@@ -17,7 +17,7 @@ _tools=21022012
 NVIDIA_VERSION=295.20
 VB_VERSION=4.1.8
 VB_BUILD=75467
-ATI_VERSION=11.12
+ATI_VERSION=12.1
 
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
@@ -27,8 +27,8 @@ ATI_VERSION=11.12
 [ "`uname -m`" == "x86_64"   ] && BC_ARCH=x86_64
 source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_112.tar.gz \
 	http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \
-	http://www2.ati.com/drivers/linux/ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \
-	makefile_compat.patch bc_wl_abiupdate.patch \
+	http://www2.ati.com/drivers/linux/amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \
+	makefile_compat.patch bc_wl_abiupdate.patch 3.2.8.patch \
 	http://fr.download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\
 	http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.bz2 config_64 config\
 	http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.bz2 \
@@ -120,12 +120,13 @@ install -m 0644 -D nvidia.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/nvi
 
 # Module ati
 cd $SRC
-sh ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati
-cd ati
+sh amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract amd
+cd amd
 patch -Np1 -i ../makefile_compat.patch
+patch -Np1 -i ../3.2.8.patch
 cd common/lib/modules/fglrx/build_mod
 cp 2.6.x/Makefile .
-cp $SRC/ati/arch/${_ARCH}/lib/modules/fglrx/build_mod/libfglrx_ip.a .
+cp $SRC/amd/arch/${_ARCH}/lib/modules/fglrx/build_mod/libfglrx_ip.a .
 make -C $SRC/linux-${_BaseVersion} SUBDIRS="`pwd`" modules
 install -m 0644 -D fglrx.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/fglrx.ko
 
-- 
cgit v1.2.3-54-g00ecf