[arch-commits] Commit in nvidia-304xx/repos (12 files)
Tobias Powalowski
tpowa at archlinux.org
Tue Dec 11 18:14:08 UTC 2012
Date: Tuesday, December 11, 2012 @ 13:14:08
Author: tpowa
Revision: 173154
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
nvidia-304xx/repos/testing-i686/PKGBUILD
(from rev 173153, nvidia-304xx/trunk/PKGBUILD)
nvidia-304xx/repos/testing-i686/nvidia.install
(from rev 173153, nvidia-304xx/trunk/nvidia.install)
nvidia-304xx/repos/testing-i686/uapi-3.7.patch
(from rev 173153, nvidia-304xx/trunk/uapi-3.7.patch)
nvidia-304xx/repos/testing-x86_64/PKGBUILD
(from rev 173153, nvidia-304xx/trunk/PKGBUILD)
nvidia-304xx/repos/testing-x86_64/nvidia.install
(from rev 173153, nvidia-304xx/trunk/nvidia.install)
nvidia-304xx/repos/testing-x86_64/uapi-3.7.patch
(from rev 173153, nvidia-304xx/trunk/uapi-3.7.patch)
Deleted:
nvidia-304xx/repos/testing-i686/PKGBUILD
nvidia-304xx/repos/testing-i686/nvidia.install
nvidia-304xx/repos/testing-i686/uapi-3.7.patch
nvidia-304xx/repos/testing-x86_64/PKGBUILD
nvidia-304xx/repos/testing-x86_64/nvidia.install
nvidia-304xx/repos/testing-x86_64/uapi-3.7.patch
-------------------------------+
testing-i686/PKGBUILD | 102 ++++++++++++++++++++--------------------
testing-i686/nvidia.install | 30 +++++------
testing-i686/uapi-3.7.patch | 84 ++++++++++++++++----------------
testing-x86_64/PKGBUILD | 102 ++++++++++++++++++++--------------------
testing-x86_64/nvidia.install | 30 +++++------
testing-x86_64/uapi-3.7.patch | 84 ++++++++++++++++----------------
6 files changed, 216 insertions(+), 216 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2012-12-11 18:13:31 UTC (rev 173153)
+++ testing-i686/PKGBUILD 2012-12-11 18:14:08 UTC (rev 173154)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia-304xx
-pkgver=304.64
-_extramodules=extramodules-3.7-ARCH
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.7' 'linux<3.8' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
-conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
- 'uapi-3.7.patch')
- md5sums=('6964415cf648a5f4f38117b168369de2'
- '502d00dc850148d61fc06c907601498e')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
- 'uapi-3.7.patch')
- md5sums=('76007ed4b72afd334e26377b646f5f7e'
- '502d00dc850148d61fc06c907601498e')
-fi
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${srcdir}"
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}/kernel"
- patch -Np0 -i "${srcdir}/uapi-3.7.patch"
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package() {
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-}
-
Copied: nvidia-304xx/repos/testing-i686/PKGBUILD (from rev 173153, nvidia-304xx/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-12-11 18:14:08 UTC (rev 173154)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia-304xx
+pkgver=304.64
+_extramodules=extramodules-3.7-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.7' 'linux<3.8' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
+conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+if [ "$CARCH" = "i686" ]; then
+ _arch='x86'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
+ 'uapi-3.7.patch')
+ md5sums=('6964415cf648a5f4f38117b168369de2'
+ '502d00dc850148d61fc06c907601498e')
+elif [ "$CARCH" = "x86_64" ]; then
+ _arch='x86_64'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
+ 'uapi-3.7.patch')
+ md5sums=('76007ed4b72afd334e26377b646f5f7e'
+ '502d00dc850148d61fc06c907601498e')
+fi
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}/kernel"
+ patch -Np0 -i "${srcdir}/uapi-3.7.patch"
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package() {
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+}
+
Deleted: testing-i686/nvidia.install
===================================================================
--- testing-i686/nvidia.install 2012-12-11 18:13:31 UTC (rev 173153)
+++ testing-i686/nvidia.install 2012-12-11 18:14:08 UTC (rev 173154)
@@ -1,15 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia-304xx/repos/testing-i686/nvidia.install (from rev 173153, nvidia-304xx/trunk/nvidia.install)
===================================================================
--- testing-i686/nvidia.install (rev 0)
+++ testing-i686/nvidia.install 2012-12-11 18:14:08 UTC (rev 173154)
@@ -0,0 +1,15 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Deleted: testing-i686/uapi-3.7.patch
===================================================================
--- testing-i686/uapi-3.7.patch 2012-12-11 18:13:31 UTC (rev 173153)
+++ testing-i686/uapi-3.7.patch 2012-12-11 18:14:08 UTC (rev 173154)
@@ -1,42 +0,0 @@
---- conftest.sh.dist 2012-10-11 19:18:22.704848496 -0400
-+++ conftest.sh 2012-10-12 20:35:55.707213868 -0400
-@@ -20,6 +20,7 @@
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
-
-@@ -118,7 +119,7 @@
- fi
- fi
-
-- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
-
- test_xen
-
-@@ -146,10 +147,10 @@
- fi
- fi
-
-- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
-
- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
- elif [ "$ARCH" = "arm" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
- fi
---- nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400
-+++ nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
-@@ -450,7 +450,7 @@
- NV_PRINT_AT(NV_DBG_MEMINFO, at);
- nv_vm_list_page_count(&at->page_table[i], pages);
-
-- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
-
- #if defined(VM_DRIVER_PAGES)
Copied: nvidia-304xx/repos/testing-i686/uapi-3.7.patch (from rev 173153, nvidia-304xx/trunk/uapi-3.7.patch)
===================================================================
--- testing-i686/uapi-3.7.patch (rev 0)
+++ testing-i686/uapi-3.7.patch 2012-12-11 18:14:08 UTC (rev 173154)
@@ -0,0 +1,42 @@
+--- conftest.sh.dist 2012-10-11 19:18:22.704848496 -0400
++++ conftest.sh 2012-10-12 20:35:55.707213868 -0400
+@@ -20,6 +20,7 @@
+ ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
+ SOURCES=$4
+ HEADERS=$SOURCES/include
++HEADERSA=$SOURCES/include/uapi
+ OUTPUT=$5
+ XEN_PRESENT=1
+
+@@ -118,7 +119,7 @@
+ fi
+ fi
+
+- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+
+ test_xen
+
+@@ -146,10 +147,10 @@
+ fi
+ fi
+
+- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+
+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
+ elif [ "$ARCH" = "arm" ]; then
+ CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
+ fi
+--- nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400
++++ nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
+@@ -450,7 +450,7 @@
+ NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ nv_vm_list_page_count(&at->page_table[i], pages);
+
+- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
++ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
+
+ #if defined(VM_DRIVER_PAGES)
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2012-12-11 18:13:31 UTC (rev 173153)
+++ testing-x86_64/PKGBUILD 2012-12-11 18:14:08 UTC (rev 173154)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia-304xx
-pkgver=304.64
-_extramodules=extramodules-3.7-ARCH
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.7' 'linux<3.8' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
-conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-
-if [ "$CARCH" = "i686" ]; then
- _arch='x86'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
- 'uapi-3.7.patch')
- md5sums=('6964415cf648a5f4f38117b168369de2'
- '502d00dc850148d61fc06c907601498e')
-elif [ "$CARCH" = "x86_64" ]; then
- _arch='x86_64'
- _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
- source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
- 'uapi-3.7.patch')
- md5sums=('76007ed4b72afd334e26377b646f5f7e'
- '502d00dc850148d61fc06c907601498e')
-fi
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${srcdir}"
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}/kernel"
- patch -Np0 -i "${srcdir}/uapi-3.7.patch"
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package() {
- install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
- install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
- echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-}
-
Copied: nvidia-304xx/repos/testing-x86_64/PKGBUILD (from rev 173153, nvidia-304xx/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-12-11 18:14:08 UTC (rev 173154)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia-304xx
+pkgver=304.64
+_extramodules=extramodules-3.7-ARCH
+pkgrel=2
+pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.7' 'linux<3.8' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
+conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+
+if [ "$CARCH" = "i686" ]; then
+ _arch='x86'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
+ 'uapi-3.7.patch')
+ md5sums=('6964415cf648a5f4f38117b168369de2'
+ '502d00dc850148d61fc06c907601498e')
+elif [ "$CARCH" = "x86_64" ]; then
+ _arch='x86_64'
+ _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+ source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
+ 'uapi-3.7.patch')
+ md5sums=('76007ed4b72afd334e26377b646f5f7e'
+ '502d00dc850148d61fc06c907601498e')
+fi
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}/kernel"
+ patch -Np0 -i "${srcdir}/uapi-3.7.patch"
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+}
+
+package() {
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+}
+
Deleted: testing-x86_64/nvidia.install
===================================================================
--- testing-x86_64/nvidia.install 2012-12-11 18:13:31 UTC (rev 173153)
+++ testing-x86_64/nvidia.install 2012-12-11 18:14:08 UTC (rev 173154)
@@ -1,15 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia-304xx/repos/testing-x86_64/nvidia.install (from rev 173153, nvidia-304xx/trunk/nvidia.install)
===================================================================
--- testing-x86_64/nvidia.install (rev 0)
+++ testing-x86_64/nvidia.install 2012-12-11 18:14:08 UTC (rev 173154)
@@ -0,0 +1,15 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Deleted: testing-x86_64/uapi-3.7.patch
===================================================================
--- testing-x86_64/uapi-3.7.patch 2012-12-11 18:13:31 UTC (rev 173153)
+++ testing-x86_64/uapi-3.7.patch 2012-12-11 18:14:08 UTC (rev 173154)
@@ -1,42 +0,0 @@
---- conftest.sh.dist 2012-10-11 19:18:22.704848496 -0400
-+++ conftest.sh 2012-10-12 20:35:55.707213868 -0400
-@@ -20,6 +20,7 @@
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
-
-@@ -118,7 +119,7 @@
- fi
- fi
-
-- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
-
- test_xen
-
-@@ -146,10 +147,10 @@
- fi
- fi
-
-- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
-
- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
- elif [ "$ARCH" = "arm" ]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
- fi
---- nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400
-+++ nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
-@@ -450,7 +450,7 @@
- NV_PRINT_AT(NV_DBG_MEMINFO, at);
- nv_vm_list_page_count(&at->page_table[i], pages);
-
-- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
-
- #if defined(VM_DRIVER_PAGES)
Copied: nvidia-304xx/repos/testing-x86_64/uapi-3.7.patch (from rev 173153, nvidia-304xx/trunk/uapi-3.7.patch)
===================================================================
--- testing-x86_64/uapi-3.7.patch (rev 0)
+++ testing-x86_64/uapi-3.7.patch 2012-12-11 18:14:08 UTC (rev 173154)
@@ -0,0 +1,42 @@
+--- conftest.sh.dist 2012-10-11 19:18:22.704848496 -0400
++++ conftest.sh 2012-10-12 20:35:55.707213868 -0400
+@@ -20,6 +20,7 @@
+ ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
+ SOURCES=$4
+ HEADERS=$SOURCES/include
++HEADERSA=$SOURCES/include/uapi
+ OUTPUT=$5
+ XEN_PRESENT=1
+
+@@ -118,7 +119,7 @@
+ fi
+ fi
+
+- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+
+ test_xen
+
+@@ -146,10 +147,10 @@
+ fi
+ fi
+
+- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
++ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
+
+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
+- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
+ elif [ "$ARCH" = "arm" ]; then
+ CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
+ fi
+--- nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400
++++ nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
+@@ -450,7 +450,7 @@
+ NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ nv_vm_list_page_count(&at->page_table[i], pages);
+
+- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
++ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
+
+ #if defined(VM_DRIVER_PAGES)
More information about the arch-commits
mailing list