[arch-commits] Commit in catalyst-dkms/repos (12 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Thu Feb 14 22:47:03 UTC 2013
Date: Thursday, February 14, 2013 @ 23:47:03
Author: lcarlier
Revision: 84263
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
catalyst-dkms/repos/community-testing-i686/
catalyst-dkms/repos/community-testing-i686/PKGBUILD
(from rev 84262, catalyst-dkms/trunk/PKGBUILD)
catalyst-dkms/repos/community-testing-i686/catalyst.install
(from rev 84262, catalyst-dkms/trunk/catalyst.install)
catalyst-dkms/repos/community-testing-i686/dkms.conf
(from rev 84262, catalyst-dkms/trunk/dkms.conf)
catalyst-dkms/repos/community-testing-i686/kernel-3.7-fixes.patch
(from rev 84262, catalyst-dkms/trunk/kernel-3.7-fixes.patch)
catalyst-dkms/repos/community-testing-i686/kernel-3.8-fixes.patch
(from rev 84262, catalyst-dkms/trunk/kernel-3.8-fixes.patch)
catalyst-dkms/repos/community-testing-x86_64/
catalyst-dkms/repos/community-testing-x86_64/PKGBUILD
(from rev 84262, catalyst-dkms/trunk/PKGBUILD)
catalyst-dkms/repos/community-testing-x86_64/catalyst.install
(from rev 84262, catalyst-dkms/trunk/catalyst.install)
catalyst-dkms/repos/community-testing-x86_64/dkms.conf
(from rev 84262, catalyst-dkms/trunk/dkms.conf)
catalyst-dkms/repos/community-testing-x86_64/kernel-3.7-fixes.patch
(from rev 84262, catalyst-dkms/trunk/kernel-3.7-fixes.patch)
catalyst-dkms/repos/community-testing-x86_64/kernel-3.8-fixes.patch
(from rev 84262, catalyst-dkms/trunk/kernel-3.8-fixes.patch)
-------------------------------------------------+
community-testing-i686/PKGBUILD | 55 ++++++++
community-testing-i686/catalyst.install | 18 ++
community-testing-i686/dkms.conf | 7 +
community-testing-i686/kernel-3.7-fixes.patch | 150 ++++++++++++++++++++++
community-testing-i686/kernel-3.8-fixes.patch | 13 +
community-testing-x86_64/PKGBUILD | 55 ++++++++
community-testing-x86_64/catalyst.install | 18 ++
community-testing-x86_64/dkms.conf | 7 +
community-testing-x86_64/kernel-3.7-fixes.patch | 150 ++++++++++++++++++++++
community-testing-x86_64/kernel-3.8-fixes.patch | 13 +
10 files changed, 486 insertions(+)
Copied: catalyst-dkms/repos/community-testing-i686/PKGBUILD (from rev 84262, catalyst-dkms/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
+# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
+
+pkgname=catalyst-dkms
+pkgver=13.1
+pkgrel=2
+pkgdesc="AMD proprietary gpu kernel driver"
+arch=('i686' 'x86_64')
+url="http://www.amd.com"
+license=('custom')
+depends=('dkms')
+optdepends=('linux-headers: build the module against Arch kernel'
+ 'linux-lts-headers: build the module against LTS Arch kernel')
+replaces=('catalyst-lts-dkms') # useless
+source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-linux-x86.x86_64.zip
+ dkms.conf
+ kernel-3.7-fixes.patch
+ kernel-3.8-fixes.patch)
+md5sums=('b5d9de9b000448dcc2a9eb74a889116d'
+ '972049dc247a74a7162f2227078abcb0'
+ '02d6442c31dd8413bc1d316308d1fa56'
+ '52a79bddac813f19f72fcb32acebb1b9')
+install=catalyst.install
+
+package() {
+ depends=(${depends[@]} "catalyst-utils=${pkgver}")
+
+ cd ${srcdir}
+
+ if [ "${CARCH}" = "x86_64" ]; then
+ _archdir=x86_64
+ else
+ _archdir=x86
+ fi
+
+ sh ./amd-driver-installer*.run --extract fglrx-install
+
+ cd fglrx-install
+ patch -Np1 -i ../kernel-3.7-fixes.patch
+ patch -Np1 -i ../kernel-3.8-fixes.patch
+
+ install -dm755 "${pkgdir}/usr/lib/modprobe.d"
+ install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}"
+ cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+ cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+ cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+ sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf"
+
+ echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
+
+ # license
+ install -Dm644 "common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}
Copied: catalyst-dkms/repos/community-testing-i686/catalyst.install (from rev 84262, catalyst-dkms/trunk/catalyst.install)
===================================================================
--- community-testing-i686/catalyst.install (rev 0)
+++ community-testing-i686/catalyst.install 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,18 @@
+post_install() {
+ dkms install -m fglrx -v $1
+}
+
+pre_upgrade() {
+ local curver=$2
+ # $2 is unset due to a bug. Query current version using pacman as fallback
+ [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}')
+ pre_remove $curver
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ dkms remove -m fglrx -v $1 --all
+}
Copied: catalyst-dkms/repos/community-testing-i686/dkms.conf (from rev 84262, catalyst-dkms/trunk/dkms.conf)
===================================================================
--- community-testing-i686/dkms.conf (rev 0)
+++ community-testing-i686/dkms.conf 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,7 @@
+PACKAGE_NAME="fglrx"
+PACKAGE_VERSION="@VERSION@"
+CLEAN="rm -f *.*o"
+BUILT_MODULE_NAME[0]="fglrx"
+MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck"
+DEST_MODULE_LOCATION[0]="/extramodules"
+AUTOINSTALL="yes"
Copied: catalyst-dkms/repos/community-testing-i686/kernel-3.7-fixes.patch (from rev 84262, catalyst-dkms/trunk/kernel-3.7-fixes.patch)
===================================================================
--- community-testing-i686/kernel-3.7-fixes.patch (rev 0)
+++ community-testing-i686/kernel-3.7-fixes.patch 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,150 @@
+diff -ur fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install-fixed/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-12-03 03:03:45.000000000 +0100
++++ fglrx-install-fixed/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-12-14 23:18:23.650713593 +0100
+@@ -3892,7 +3892,11 @@
+ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
+ return -EAGAIN;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_ops;
+ break;
+
+@@ -3922,14 +3926,22 @@
+ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
+ return -EAGAIN;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_ops;
+ }
+ break;
+ #endif
+
+ case __KE_SHM:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_shm_ops;
+ break;
+
+@@ -3937,7 +3949,11 @@
+
+ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
++#else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+
+ //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */
+ //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+@@ -3946,14 +3962,22 @@
+
+ case __KE_CTX:
+ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+ vma->vm_ops = &vm_ctx_ops;
+ break;
+
+ case __KE_PCI_BQS:
+ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+ vma->vm_ops = &vm_pci_bq_ops;
+ break;
+@@ -3984,9 +4008,17 @@
+ return -EAGAIN;
+ }
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
+ #else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ #endif
+ vma->vm_ops = &vm_ops;
+ }
+@@ -4015,9 +4047,17 @@
+ return -EAGAIN;
+ }
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
+ #else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ #endif
+ vma->vm_ops = &vm_agp_bq_ops;
+ }
+@@ -4025,7 +4065,11 @@
+ #endif /* __AGP__BUILTIN__ */
+
+ case __KE_KMAP:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED;
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_kmap_ops;
+ if (readonly && (vma->vm_flags & VM_WRITE))
+ {
+@@ -4046,7 +4090,11 @@
+ #endif
+ // fall through
+ case __KE_GART_CACHEABLE:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
++#else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_gart_ops;
+ break;
+ default:
+diff -ur fglrx-install/common/lib/modules/fglrx/build_mod/make.sh fglrx-install-fixed/common/lib/modules/fglrx/build_mod/make.sh
+--- fglrx-install/common/lib/modules/fglrx/build_mod/make.sh 2012-12-03 03:03:45.000000000 +0100
++++ fglrx-install-fixed/common/lib/modules/fglrx/build_mod/make.sh 2012-12-14 23:10:51.808599920 +0100
+@@ -203,10 +203,12 @@
+ # sample: #define UTS_RELEASE "2.4.0-test7"
+
+ src_file=$linuxincludes/linux/version.h
++src_file_alternative=$linuxincludes/generated/linux/version.h
+
+-if [ ! -e $src_file ]; then
++if [ ! -e $src_file && ! -e $src_file_alternative ]; then
+ echo "kernel includes at $linuxincludes not found or incomplete" | tee -a $logfile
+ echo "file: $src_file" | tee -a $logfile
++ echo "file: $src_file_alternative" | tee -a $logfile
+ exit 1
+ fi
+
Copied: catalyst-dkms/repos/community-testing-i686/kernel-3.8-fixes.patch (from rev 84262, catalyst-dkms/trunk/kernel-3.8-fixes.patch)
===================================================================
--- community-testing-i686/kernel-3.8-fixes.patch (rev 0)
+++ community-testing-i686/kernel-3.8-fixes.patch 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,13 @@
+--- 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-10-23 22:44:52.000000000 +0200
++++ 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-12-22 22:11:30.289750331 +0100
+@@ -775,7 +775,9 @@
+ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
++ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
++ #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+ pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
+ #else
+ pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
Copied: catalyst-dkms/repos/community-testing-x86_64/PKGBUILD (from rev 84262, catalyst-dkms/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
+# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
+
+pkgname=catalyst-dkms
+pkgver=13.1
+pkgrel=2
+pkgdesc="AMD proprietary gpu kernel driver"
+arch=('i686' 'x86_64')
+url="http://www.amd.com"
+license=('custom')
+depends=('dkms')
+optdepends=('linux-headers: build the module against Arch kernel'
+ 'linux-lts-headers: build the module against LTS Arch kernel')
+replaces=('catalyst-lts-dkms') # useless
+source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-linux-x86.x86_64.zip
+ dkms.conf
+ kernel-3.7-fixes.patch
+ kernel-3.8-fixes.patch)
+md5sums=('b5d9de9b000448dcc2a9eb74a889116d'
+ '972049dc247a74a7162f2227078abcb0'
+ '02d6442c31dd8413bc1d316308d1fa56'
+ '52a79bddac813f19f72fcb32acebb1b9')
+install=catalyst.install
+
+package() {
+ depends=(${depends[@]} "catalyst-utils=${pkgver}")
+
+ cd ${srcdir}
+
+ if [ "${CARCH}" = "x86_64" ]; then
+ _archdir=x86_64
+ else
+ _archdir=x86
+ fi
+
+ sh ./amd-driver-installer*.run --extract fglrx-install
+
+ cd fglrx-install
+ patch -Np1 -i ../kernel-3.7-fixes.patch
+ patch -Np1 -i ../kernel-3.8-fixes.patch
+
+ install -dm755 "${pkgdir}/usr/lib/modprobe.d"
+ install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}"
+ cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+ cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+ cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+ sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf"
+
+ echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
+
+ # license
+ install -Dm644 "common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}
Copied: catalyst-dkms/repos/community-testing-x86_64/catalyst.install (from rev 84262, catalyst-dkms/trunk/catalyst.install)
===================================================================
--- community-testing-x86_64/catalyst.install (rev 0)
+++ community-testing-x86_64/catalyst.install 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,18 @@
+post_install() {
+ dkms install -m fglrx -v $1
+}
+
+pre_upgrade() {
+ local curver=$2
+ # $2 is unset due to a bug. Query current version using pacman as fallback
+ [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}')
+ pre_remove $curver
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ dkms remove -m fglrx -v $1 --all
+}
Copied: catalyst-dkms/repos/community-testing-x86_64/dkms.conf (from rev 84262, catalyst-dkms/trunk/dkms.conf)
===================================================================
--- community-testing-x86_64/dkms.conf (rev 0)
+++ community-testing-x86_64/dkms.conf 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,7 @@
+PACKAGE_NAME="fglrx"
+PACKAGE_VERSION="@VERSION@"
+CLEAN="rm -f *.*o"
+BUILT_MODULE_NAME[0]="fglrx"
+MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck"
+DEST_MODULE_LOCATION[0]="/extramodules"
+AUTOINSTALL="yes"
Copied: catalyst-dkms/repos/community-testing-x86_64/kernel-3.7-fixes.patch (from rev 84262, catalyst-dkms/trunk/kernel-3.7-fixes.patch)
===================================================================
--- community-testing-x86_64/kernel-3.7-fixes.patch (rev 0)
+++ community-testing-x86_64/kernel-3.7-fixes.patch 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,150 @@
+diff -ur fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install-fixed/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-12-03 03:03:45.000000000 +0100
++++ fglrx-install-fixed/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-12-14 23:18:23.650713593 +0100
+@@ -3892,7 +3892,11 @@
+ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
+ return -EAGAIN;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_ops;
+ break;
+
+@@ -3922,14 +3926,22 @@
+ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
+ return -EAGAIN;
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_ops;
+ }
+ break;
+ #endif
+
+ case __KE_SHM:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_shm_ops;
+ break;
+
+@@ -3937,7 +3949,11 @@
+
+ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
++#else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+
+ //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */
+ //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+@@ -3946,14 +3962,22 @@
+
+ case __KE_CTX:
+ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+ vma->vm_ops = &vm_ctx_ops;
+ break;
+
+ case __KE_PCI_BQS:
+ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+ vma->vm_ops = &vm_pci_bq_ops;
+ break;
+@@ -3984,9 +4008,17 @@
+ return -EAGAIN;
+ }
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
+ #else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ #endif
+ vma->vm_ops = &vm_ops;
+ }
+@@ -4015,9 +4047,17 @@
+ return -EAGAIN;
+ }
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
+ #else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ #endif
+ vma->vm_ops = &vm_agp_bq_ops;
+ }
+@@ -4025,7 +4065,11 @@
+ #endif /* __AGP__BUILTIN__ */
+
+ case __KE_KMAP:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_SHM | VM_RESERVED;
++#else
++ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_kmap_ops;
+ if (readonly && (vma->vm_flags & VM_WRITE))
+ {
+@@ -4046,7 +4090,11 @@
+ #endif
+ // fall through
+ case __KE_GART_CACHEABLE:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= VM_RESERVED;
++#else
++ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ vma->vm_ops = &vm_gart_ops;
+ break;
+ default:
+diff -ur fglrx-install/common/lib/modules/fglrx/build_mod/make.sh fglrx-install-fixed/common/lib/modules/fglrx/build_mod/make.sh
+--- fglrx-install/common/lib/modules/fglrx/build_mod/make.sh 2012-12-03 03:03:45.000000000 +0100
++++ fglrx-install-fixed/common/lib/modules/fglrx/build_mod/make.sh 2012-12-14 23:10:51.808599920 +0100
+@@ -203,10 +203,12 @@
+ # sample: #define UTS_RELEASE "2.4.0-test7"
+
+ src_file=$linuxincludes/linux/version.h
++src_file_alternative=$linuxincludes/generated/linux/version.h
+
+-if [ ! -e $src_file ]; then
++if [ ! -e $src_file && ! -e $src_file_alternative ]; then
+ echo "kernel includes at $linuxincludes not found or incomplete" | tee -a $logfile
+ echo "file: $src_file" | tee -a $logfile
++ echo "file: $src_file_alternative" | tee -a $logfile
+ exit 1
+ fi
+
Copied: catalyst-dkms/repos/community-testing-x86_64/kernel-3.8-fixes.patch (from rev 84262, catalyst-dkms/trunk/kernel-3.8-fixes.patch)
===================================================================
--- community-testing-x86_64/kernel-3.8-fixes.patch (rev 0)
+++ community-testing-x86_64/kernel-3.8-fixes.patch 2013-02-14 22:47:03 UTC (rev 84263)
@@ -0,0 +1,13 @@
+--- 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-10-23 22:44:52.000000000 +0200
++++ 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2012-12-22 22:11:30.289750331 +0100
+@@ -775,7 +775,9 @@
+ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
++ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
++ #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+ pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
+ #else
+ pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
More information about the arch-commits
mailing list