quark
/
quarks
1
0
Fork 0
Code Pull Requests Activity

Make pax-usercopy.patch work

This commit is contained in:
Stefan Reimer 2011-10-10 18:56:35 -07:00
parent f117e5663e
commit 3ae35ea0d0
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11-drivers/nvidia-drivers/Manifest
View File

@ -1,9 +1,9 @@
AUX 256.35-unified-arch.patch 1380 RMD160 2612cad105f442d4232b99e3054124e8037860bb SHA1 d82433c0b3520c87e05f1013a59b243ec65ebe97 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7
AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577
AUX nvidia-drivers-275.19-pax-const.patch 833 RMD160 100c36ed4c7db0f30c0680b276a708cd5ed75749 SHA1 b336665366340fec6bd400f36d3e4b9de86473f5 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8
AUX nvidia-drivers-285.03-pax-usercopy.patch 2043 RMD160 08453cfed4d50622709f47bdce44ad7c828ad5d1 SHA1 374b228cb7ae766f4c19875a5d8395f2da7d63f8 SHA256 8b0055fd6ba86531f968ee67f3c026d6fda05f0f3288371f23c4c5cc34ca53de
AUX nvidia-drivers-pax-const.patch 833 RMD160 100c36ed4c7db0f30c0680b276a708cd5ed75749 SHA1 b336665366340fec6bd400f36d3e4b9de86473f5 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8
AUX nvidia-drivers-pax-usercopy.patch 2197 RMD160 f1fe01e79f52650f7ad377fc82f6526278d0aad8 SHA1 c8d96c2ff282f8d2ffbea4f34e909e3890a3f13b SHA256 8f5ec453bcad9439097f7bbbd2c211f8001fceb9dd00ef4eb30e94d34fcfde58
DIST NVIDIA-FreeBSD-x86-285.05.09.tar.gz 30697710 RMD160 e08981374a67a8e9e9bff42d5cbb5f5ecef0568c SHA1 d3e4cb6cac7af0392d0f294cf67b029456a48100 SHA256 d3ad51145cd57c70678ee659112a0973187b1b02e3062addadd0fe094b3c46fb
DIST NVIDIA-Linux-x86-285.05.09.run 33592492 RMD160 e5fb559c3eb6f928649a94bfd73d80d0b1561dd3 SHA1 e42112d15ba217fc1c16afbae45f0493f795966c SHA256 ce03fa99b62081b52bd5dae3594ac5942413ed530cda3d76a82f4ab0afd36f96
DIST NVIDIA-Linux-x86_64-285.05.09.run 56674677 RMD160 e178cc5109bbf254c80eb123acd6276bf34d7790 SHA1 26c99d119f39a9201943a4f44cdc110988ec2349 SHA256 7159a1f7e898b50dd49ea2273ac6facb870546ad5496bf70c6fbe1642d2c4970
EBUILD nvidia-drivers-285.05.09.ebuild 16744 RMD160 942aaa50f5e6592c0d15f6c3644e6d63c6dd97fd SHA1 8884c8bb6ab8a32bb9474f033e86cabb82504af1 SHA256 144535ef033ba2b0618b8094589c184baf712a22afec5a41622a7e85f62b99ac
EBUILD nvidia-drivers-285.05.09.ebuild 16728 RMD160 7e04fdafde11fdee6b126c9be1cc99c356ae1da6 SHA1 54e56a8dc0366761dac6a0801134871370a8d266 SHA256 9bf1a2695e4afe19787d8616c3921f1434a2ad867190de183800dad5c9277680
MISC ebuild.diff 736 RMD160 b0c43ad9d4f2dbbd35a195b22b2bea698dbbafcd SHA1 753ad14db964fe133936e497aaed56b8e04256d2 SHA256 5ca532e00bec17cd5193a19a6fcae5231d3fe0b8c68f3b2e8dd480ac0dc1f67e

0
x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch → x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch
View File

27
x11-drivers/nvidia-drivers/files/nvidia-drivers-285.03-pax-usercopy.patch → x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch
View File

@ -1,5 +1,6 @@
--- nvidia-drivers-285.03/kernel/nv-linux.h.orig 2011-09-28 18:42:55.523481694 -0700
+++ nvidia-drivers-285.03/kernel/nv-linux.h 2011-09-28 18:44:04.411481685 -0700
diff -u kernel/nv-linux.h kernel-orig/nv-linux.h
--- kernel-orig/nv-linux.h 2011-09-23 17:32:09.000000000 -0700
+++ kernel/nv-linux.h 2011-10-10 18:01:45.391793788 -0700
@@ -695,16 +695,16 @@
#if defined(NV_KMEM_CACHE_CREATE_PRESENT)
@ -9,21 +10,22 @@
{ \
kmem_cache = kmem_cache_create(name, sizeof(type), \
- 0, 0, NULL, NULL); \
+ 0, flags, NULL, NULL); \
+ 0, flags, NULL, NULL); \
}
#elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
-#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type) \
+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags) \
{ \
kmem_cache = kmem_cache_create(name, sizeof(type), \
- 0, 0, NULL); \
+ 0, flags, NULL); \
- 0, 0, NULL); \
}
#else
#error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
--- nvidia-drivers-275.09.07/kernel/nv.c 2011-06-09 00:42:32.000000000 +0200
+++ nvidia-drivers-275.09.07-patched/kernel//nv.c 2011-06-24 12:52:19.912000190 +0200
@@ -1103,7 +1103,7 @@ static int __init nvidia_init_module(voi
diff -u kernel/nv.c kernel-orig/nv.c
--- kernel-orig/nv.c 2011-09-23 17:32:09.000000000 -0700
+++ kernel/nv.c 2011-10-10 18:49:39.331880626 -0700
@@ -1105,7 +1105,7 @@
NV_SPIN_LOCK_INIT(&km_lock);
#endif
@ -32,7 +34,7 @@
if (nv_stack_t_cache == NULL)
{
nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
@@ -1218,7 +1218,7 @@ static int __init nvidia_init_module(voi
@@ -1220,7 +1220,7 @@
}
#endif
@ -41,3 +43,12 @@
if (nv_pte_t_cache == NULL)
{
rc = -ENOMEM;
@@ -1229,7 +1229,7 @@
}
NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
- nvidia_p2p_page_t);
+ nvidia_p2p_page_t, 0);
if (nvidia_p2p_page_t_cache == NULL)
{
rc = -ENOMEM;

4
x11-drivers/nvidia-drivers/nvidia-drivers-285.05.09.ebuild
View File

@ -290,8 +290,8 @@ src_prepare() {
fi
if use pax_kernel; then
epatch "${FILESDIR}"/nvidia-drivers-275.19-pax-const.patch
# epatch "${FILESDIR}"/nvidia-drivers-285.03-pax-usercopy.patch
epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
fi
}