diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Pkgfile | 28 | ||||
| -rw-r--r-- | kernel/ati-kernel-3.2.8.patch | 21 |
2 files changed, 36 insertions, 13 deletions
diff --git a/kernel/Pkgfile b/kernel/Pkgfile index fd5a42c0e..5290c5005 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -25,16 +25,17 @@ ATI_VERSION=12.1 [ "`uname -m`" == "x86_64" ] && VB_ARCH=amd64 [ "`uname -m`" == "i686" ] && BC_ARCH=x86_32 [ "`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/amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \ - makefile_compat.patch bc_wl_abiupdate.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 \ - http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash \ - http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2\ - http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2) +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/amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run + 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 + http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash + http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2 + http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2 + makefile_compat.patch bc_wl_abiupdate.patch ati-kernel-3.2.8.patch) + build(){ sed -i "s/^SCRIPT_VERSION=.\{1,\}/SCRIPT_VERSION=\"$SCRIPT_VERSION\"/" `prt-get printf %p --filter=$name`/$name/post-install @@ -120,12 +121,13 @@ install -m 0644 -D nvidia.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/nvi # Module ati cd $SRC -sh amd-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 ../ati-kernel-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 diff --git a/kernel/ati-kernel-3.2.8.patch b/kernel/ati-kernel-3.2.8.patch new file mode 100644 index 000000000..381250214 --- /dev/null +++ b/kernel/ati-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 |