[arch-commits] Commit in nvidia/repos (14 files)
Thomas Bächler
thomas at nymeria.archlinux.org
Wed Apr 9 22:22:29 UTC 2014
Date: Thursday, April 10, 2014 @ 00:22:28
Author: thomas
Revision: 210107
db-move: moved nvidia from [testing] to [extra] (i686, x86_64)
Added:
nvidia/repos/extra-i686/PKGBUILD
(from rev 210105, nvidia/repos/testing-i686/PKGBUILD)
nvidia/repos/extra-i686/nvidia-3.14.patch
(from rev 210105, nvidia/repos/testing-i686/nvidia-3.14.patch)
nvidia/repos/extra-i686/nvidia.install
(from rev 210105, nvidia/repos/testing-i686/nvidia.install)
nvidia/repos/extra-x86_64/PKGBUILD
(from rev 210105, nvidia/repos/testing-x86_64/PKGBUILD)
nvidia/repos/extra-x86_64/nvidia-3.14.patch
(from rev 210105, nvidia/repos/testing-x86_64/nvidia-3.14.patch)
nvidia/repos/extra-x86_64/nvidia.install
(from rev 210105, nvidia/repos/testing-x86_64/nvidia.install)
Deleted:
nvidia/repos/extra-i686/PKGBUILD
nvidia/repos/extra-i686/nvidia.install
nvidia/repos/extra-i686/nvidia_3.13_kernel.patch
nvidia/repos/extra-x86_64/PKGBUILD
nvidia/repos/extra-x86_64/nvidia.install
nvidia/repos/extra-x86_64/nvidia_3.13_kernel.patch
nvidia/repos/testing-i686/
nvidia/repos/testing-x86_64/
---------------------------------------+
/PKGBUILD | 104 ++++++++++++++++++++++++++++++++
/nvidia.install | 36 +++++++++++
extra-i686/PKGBUILD | 49 ---------------
extra-i686/nvidia-3.14.patch | 12 +++
extra-i686/nvidia.install | 18 -----
extra-i686/nvidia_3.13_kernel.patch | 46 --------------
extra-x86_64/PKGBUILD | 49 ---------------
extra-x86_64/nvidia-3.14.patch | 12 +++
extra-x86_64/nvidia.install | 18 -----
extra-x86_64/nvidia_3.13_kernel.patch | 46 --------------
10 files changed, 164 insertions(+), 226 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-09 22:22:26 UTC (rev 210106)
+++ extra-i686/PKGBUILD 2014-04-09 22:22:28 UTC (rev 210107)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=334.21
-_extramodules=extramodules-3.13-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.13' 'linux<3.14' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.13' 'linux-headers<3.14')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
- "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('3b2736dd6ed7e24f71004bad0e55e32e'
- 'f96b6708702830fe647a7d11832c514e')
-
-[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
-[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
-prepare() {
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}"
- # patches here
-}
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-
- cd uvm
- 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 -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.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"
-}
Copied: nvidia/repos/extra-i686/PKGBUILD (from rev 210105, nvidia/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-09 22:22:28 UTC (rev 210107)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=334.21
+_extramodules=extramodules-3.14-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.14' 'linux<3.15' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.14' 'linux-headers<3.15')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ 'nvidia-3.14.patch')
+md5sums=('3b2736dd6ed7e24f71004bad0e55e32e'
+ 'f96b6708702830fe647a7d11832c514e'
+ '08810729376eb0f829dedaf00d1c5915')
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -p1 -i "${srcdir}/nvidia-3.14.patch"
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+ cd uvm
+ 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 -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.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"
+}
Copied: nvidia/repos/extra-i686/nvidia-3.14.patch (from rev 210105, nvidia/repos/testing-i686/nvidia-3.14.patch)
===================================================================
--- extra-i686/nvidia-3.14.patch (rev 0)
+++ extra-i686/nvidia-3.14.patch 2014-04-09 22:22:28 UTC (rev 210107)
@@ -0,0 +1,12 @@
+--- a/kernel/nv-linux.h 2014-01-09 04:49:25.000000000 +0200
++++ b/kernel/nv-linux.h 2014-02-05 16:46:55.552408568 +0200
+@@ -273,8 +273,7 @@
+ #endif
+
+ #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_drivers.h>
++#include <linux/acpi.h>
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
Deleted: extra-i686/nvidia.install
===================================================================
--- extra-i686/nvidia.install 2014-04-09 22:22:26 UTC (rev 210106)
+++ extra-i686/nvidia.install 2014-04-09 22:22:28 UTC (rev 210107)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.13-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.13-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
- echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
- fi
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.13-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/extra-i686/nvidia.install (from rev 210105, nvidia/repos/testing-i686/nvidia.install)
===================================================================
--- extra-i686/nvidia.install (rev 0)
+++ extra-i686/nvidia.install 2014-04-09 22:22:28 UTC (rev 210107)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
+ echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
+ fi
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Deleted: extra-i686/nvidia_3.13_kernel.patch
===================================================================
--- extra-i686/nvidia_3.13_kernel.patch 2014-04-09 22:22:26 UTC (rev 210106)
+++ extra-i686/nvidia_3.13_kernel.patch 2014-04-09 22:22:28 UTC (rev 210107)
@@ -1,46 +0,0 @@
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -15,6 +15,10 @@
- #include "nv-linux.h"
- #include "nv-reg.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
-+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
-+#endif
-+
- #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
- static RM_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
- static RM_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *);
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
-
- if (pNvAcpiObject->notify_handler_installed)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
- NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
-
- // remove event notifier
- status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -405,11 +405,17 @@ typedef void irqreturn_t;
- // not require the RCU's read lock on current->cred.
- //
- //
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define NV_KUID_TO_UID(value) (__kuid_val(value))
-+#else
-+#define NV_KUID_TO_UID(value) (value)
-+#endif
-+
- #if defined(NV_TASK_STRUCT_HAS_CRED)
- #define NV_CURRENT_EUID() \
-- (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
-+ NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid)
- #else
--#define NV_CURRENT_EUID() (current->euid)
-+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
- #endif
-
- #define NV_ATOMIC_SET(data,val) atomic_set(&(data), (val))
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-09 22:22:26 UTC (rev 210106)
+++ extra-x86_64/PKGBUILD 2014-04-09 22:22:28 UTC (rev 210107)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer : Thomas Baechler <thomas at archlinux.org>
-
-pkgname=nvidia
-pkgver=334.21
-_extramodules=extramodules-3.13-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.13' 'linux<3.14' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.13' 'linux-headers<3.14')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
- "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('3b2736dd6ed7e24f71004bad0e55e32e'
- 'f96b6708702830fe647a7d11832c514e')
-
-[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
-[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
-prepare() {
- sh "${_pkg}.run" --extract-only
- cd "${_pkg}"
- # patches here
-}
-
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
- cd "${_pkg}"/kernel
- make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-
- cd uvm
- 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 -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
- "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
- gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.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"
-}
Copied: nvidia/repos/extra-x86_64/PKGBUILD (from rev 210105, nvidia/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-09 22:22:28 UTC (rev 210107)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer : Thomas Baechler <thomas at archlinux.org>
+
+pkgname=nvidia
+pkgver=334.21
+_extramodules=extramodules-3.14-ARCH
+pkgrel=4
+pkgdesc="NVIDIA drivers for linux"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux>=3.14' 'linux<3.15' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.14' 'linux-headers<3.15')
+conflicts=('nvidia-96xx' 'nvidia-173xx')
+license=('custom')
+install=nvidia.install
+options=(!strip)
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ 'nvidia-3.14.patch')
+md5sums=('3b2736dd6ed7e24f71004bad0e55e32e'
+ 'f96b6708702830fe647a7d11832c514e'
+ '08810729376eb0f829dedaf00d1c5915')
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -p1 -i "${srcdir}/nvidia-3.14.patch"
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${_pkg}"/kernel
+ make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+ cd uvm
+ 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 -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.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"
+}
Copied: nvidia/repos/extra-x86_64/nvidia-3.14.patch (from rev 210105, nvidia/repos/testing-x86_64/nvidia-3.14.patch)
===================================================================
--- extra-x86_64/nvidia-3.14.patch (rev 0)
+++ extra-x86_64/nvidia-3.14.patch 2014-04-09 22:22:28 UTC (rev 210107)
@@ -0,0 +1,12 @@
+--- a/kernel/nv-linux.h 2014-01-09 04:49:25.000000000 +0200
++++ b/kernel/nv-linux.h 2014-02-05 16:46:55.552408568 +0200
+@@ -273,8 +273,7 @@
+ #endif
+
+ #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_drivers.h>
++#include <linux/acpi.h>
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
Deleted: extra-x86_64/nvidia.install
===================================================================
--- extra-x86_64/nvidia.install 2014-04-09 22:22:26 UTC (rev 210106)
+++ extra-x86_64/nvidia.install 2014-04-09 22:22:28 UTC (rev 210107)
@@ -1,18 +0,0 @@
-post_install() {
- EXTRAMODULES='extramodules-3.13-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
- EXTRAMODULES='extramodules-3.13-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
- if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
- echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
- fi
-}
-
-post_remove() {
- EXTRAMODULES='extramodules-3.13-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
Copied: nvidia/repos/extra-x86_64/nvidia.install (from rev 210105, nvidia/repos/testing-x86_64/nvidia.install)
===================================================================
--- extra-x86_64/nvidia.install (rev 0)
+++ extra-x86_64/nvidia.install 2014-04-09 22:22:28 UTC (rev 210107)
@@ -0,0 +1,18 @@
+post_install() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
+ echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
+ fi
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.13-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
Deleted: extra-x86_64/nvidia_3.13_kernel.patch
===================================================================
--- extra-x86_64/nvidia_3.13_kernel.patch 2014-04-09 22:22:26 UTC (rev 210106)
+++ extra-x86_64/nvidia_3.13_kernel.patch 2014-04-09 22:22:28 UTC (rev 210107)
@@ -1,46 +0,0 @@
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -15,6 +15,10 @@
- #include "nv-linux.h"
- #include "nv-reg.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
-+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
-+#endif
-+
- #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
- static RM_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
- static RM_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *);
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
-
- if (pNvAcpiObject->notify_handler_installed)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
- NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
-
- // remove event notifier
- status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -405,11 +405,17 @@ typedef void irqreturn_t;
- // not require the RCU's read lock on current->cred.
- //
- //
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define NV_KUID_TO_UID(value) (__kuid_val(value))
-+#else
-+#define NV_KUID_TO_UID(value) (value)
-+#endif
-+
- #if defined(NV_TASK_STRUCT_HAS_CRED)
- #define NV_CURRENT_EUID() \
-- (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
-+ NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid)
- #else
--#define NV_CURRENT_EUID() (current->euid)
-+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
- #endif
-
- #define NV_ATOMIC_SET(data,val) atomic_set(&(data), (val))
More information about the arch-commits
mailing list