From 69075789750a779d6a40fc8d8f64633f65855110 Mon Sep 17 00:00:00 2001 From: Diskmaster Date: Mon, 11 Aug 2008 18:51:27 -0500 Subject: [PATCH] Rediff'd 177.13's new patch against 173.14.12. Should compile fine without the init_mm error. --- x11-drivers/nvidia-drivers/Manifest | 6 +- .../nvidia-drivers/files/NV-173.14.12-new.patch | 408 +++++++++++++++++++++ ...2.broken => nvidia-drivers-173.14.12-r2.ebuild} | 5 +- 3 files changed, 414 insertions(+), 5 deletions(-) create mode 100644 x11-drivers/nvidia-drivers/files/NV-173.14.12-new.patch rename x11-drivers/nvidia-drivers/{nvidia-drivers-173.14.12-r2.broken => nvidia-drivers-173.14.12-r2.ebuild} (98%) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 2440b7b..0437a79 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1,4 +1,5 @@ AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 +AUX NV-173.14.12-new.patch 13595 RMD160 b8ba6b5ff46addace31d06e18ae786d33213565e SHA1 63973fa684e88bb11c63bd63334701b89e9bed64 SHA256 f809fbbc76c5dfd000229d10fbbf44e64a0809a92821fae7dfbb10ea379a97cc AUX NV-177.13-new.patch 19484 RMD160 8f83d6650fd9536efa79f82210fe9da4a7716d33 SHA1 48b84cf47623ed9fa02b2b46f674d1d530ca8709 SHA256 3943f540961df9c699a8b300205598fdcf271b05d55333469ed8bc3e5107eb1e AUX NVIDIA-2.6.26-rc-fix.patch 17479 RMD160 20367f673a82cf4dfb883be115c7d05dbb3b7561 SHA1 a5aa48d8418c55e891267c37d3a401feee6f17ac SHA256 05bff541d25ec946c2cf262a16690279cb41590c4fa367ca16a85a460c1d2343 AUX NVIDIA-2626-compatibility.patch 18598 RMD160 f6874805f482776a47c87e18d9fa8545bb73b9bf SHA1 3941162a0f353a92b9c2db5ae10511ff73efbc92 SHA256 ad6c2da9a508fae7b8728628e1980319dc3c7f62694c34a80ddc0343a1361aec @@ -17,10 +18,13 @@ AUX nv-173-post-2.6.26-update.patch 5641 RMD160 8494f4002284920fbb1470c30d0aa26c AUX nv-177-post-2.6.26-update.patch 7843 RMD160 47d87174ef56a18a04dd80c466c0384df3254fe9 SHA1 39d5c928780717492425f121c276827d4cc72d7a SHA256 b3ad95534e3690e3b464a563ce0ac3c4e6c2124d4fb44900f345534a56e94ba8 AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167dcc063ba61426523973e9598085f7 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5 AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 +DIST NVIDIA-FreeBSD-x86-173.14.12.tar.gz 15856061 RMD160 c68ef8983bbd84d68142c8277ab6cb8c6cef7d70 SHA1 711a64b4bd68bb665abb649373adee6b7f07ef3e SHA256 0b9849d0f2b09533c384227370c94469a45384adc216a8b716a02bfc9a7340be DIST NVIDIA-FreeBSD-x86-177.13.tar.gz 16216189 RMD160 26a8a88e7f1b5d71c49144be7372e400981ebafa SHA1 08f74ddcc53ac58b81340ff16ed1fc9e3ad9fe57 SHA256 e96f61970a1f3aa52f0189ad714b713583e612ca37fc803bc9f894c4bc6eb965 +DIST NVIDIA-Linux-x86-173.14.12-pkg0.run 11587505 RMD160 97d02d21f94b2c93f27af044a17dd8a990bdc17e SHA1 64e366fe15dabc6db0f452c58285258e6e60440c SHA256 a5d9e087cbe0f34bb9ae11e36fa25ce5b9622b0b50cd4e639aab1181e6379b11 DIST NVIDIA-Linux-x86-177.13-pkg0.run 11920970 RMD160 bbb60fb527befc3826f5855c8e1a9f8c5f2756a3 SHA1 a602e602af612b0190deb31890dda708cc479891 SHA256 2a063046137ca0a92c081b4d1d931f4bb7ba18e885e2713467aa72c2706609c4 +DIST NVIDIA-Linux-x86_64-173.14.12-pkg2.run 16794952 RMD160 68e27029a16dfe7a5b671a4ab332cca162eee78e SHA1 78d3034314df7f9c95526707d7fcf4543f5993ed SHA256 9a208cefd503d110c4383c41a2efa67fe9b6fa584d3d9dc643e927a3eece74c9 DIST NVIDIA-Linux-x86_64-177.13-pkg2.run 18711739 RMD160 066a4349c79183eb3bdfdc1c7539a291c03e18a4 SHA1 5572e005e30f766d406ba3391128f3fc22d38f65 SHA256 5cca2f0f135a311d230847e17556e65d0e49963991e9e7318d4fba4a58e8a84b +EBUILD nvidia-drivers-173.14.12-r2.ebuild 15192 RMD160 f71fefc8c0757f4b3691902b574f1efecfe5c8ce SHA1 675657863cbf2b279c9d9bcd008c24d7911f4fe7 SHA256 2b2492f93b64945cf31470170a5aaea90e7e8b7df9699c8985e02b2c82f9bb4f EBUILD nvidia-drivers-177.13-r2.ebuild 15126 RMD160 8e384e8a8ae253909eb2d3b462e32a21b16fde25 SHA1 5de7e1355f98895b248f4c8b9bec374b6bbcdc25 SHA256 d8f4fe42a4a6774457239bf39b0d7d00bf8449ff323410eba1ac41a1fddea111 -MISC nvidia-drivers-173.14.12-r2.broken 15352 RMD160 bfb62b97aa6041c88557c5281fa28a83c4f3c48d SHA1 f92cfed173aefc34cb3df2891774d29bb74dee5d SHA256 e982f58d091961bbb98283b27bf96db4ac9bfe2c92dd068ff744b821fcf81ce9 MISC nvidia-drivers-71.86.06-r1.broken 14155 RMD160 f207839e179320ed6856ebedba226f96dfb60b97 SHA1 20afc2d05be6961e3fa543c641e639aaddaf9ac5 SHA256 c6ae256df48c4d98406d7b0ea6a477844f32259e9d9b34888304d459352934ca MISC nvidia-drivers-96.43.07-r1.broken 14492 RMD160 6562d2a1c80231aeda3f2697f8163cc7468cb7ef SHA1 f6735a288296394ab339d26059ad022aa4c8e735 SHA256 0282550955420e78ed9e54315635e64870dd2e1b3e2384a517f3e4609fd92db7 diff --git a/x11-drivers/nvidia-drivers/files/NV-173.14.12-new.patch b/x11-drivers/nvidia-drivers/files/NV-173.14.12-new.patch new file mode 100644 index 0000000..880afb5 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/NV-173.14.12-new.patch @@ -0,0 +1,408 @@ +diff -ur NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/Makefile.kbuild +--- NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/Makefile.kbuild 2008-08-11 18:27:22.000000000 -0500 ++++ NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/Makefile.kbuild 2008-08-11 18:29:48.000000000 -0500 +@@ -188,13 +188,16 @@ + acpi_device_ops \ + acpi_device_id \ + acquire_console_sem \ +- kmem_cache_create ++ kmem_cache_create \ ++ on_each_cpu \ ++ smp_call_function + else + COMPILE_TESTS = \ + remap_page_range \ + vmap \ + change_page_attr \ +- i2c_adapter ++ i2c_adapter \ ++ smp_call_function + endif + + # +diff -ur NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/Makefile.nvidia NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/Makefile.nvidia +--- NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/Makefile.nvidia 2008-07-17 20:42:29.000000000 -0500 ++++ NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/Makefile.nvidia 2008-08-11 18:30:09.000000000 -0500 +@@ -62,7 +62,8 @@ + remap_page_range \ + vmap \ + change_page_attr \ +- i2c_adapter ++ i2c_adapter \ ++ smp_call_function + + DEFINES+=$(EXTRA_DEFINES) + +diff -ur NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/conftest.sh +--- NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/conftest.sh 2008-07-17 20:42:29.000000000 -0500 ++++ NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/conftest.sh 2008-08-11 18:33:09.000000000 -0500 +@@ -774,6 +774,120 @@ + fi + ;; + ++ smp_call_function) ++ # ++ # Determine if the smp_call_function() function is ++ # present and how many arguments it takes. ++ # ++ echo "$CONFTEST_PREAMBLE ++ #include ++ void conftest_smp_call_function(void) { ++ #ifdef CONFIG_SMP ++ smp_call_function(); ++ #endif ++ }" > conftest$$.c ++ ++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 ++ rm -f conftest$$.c ++ ++ if [ -f conftest$$.o ]; then ++ rm -f conftest$$.o ++ echo "#undef NV_SMP_CALL_FUNCTION_PRESENT" >> conftest.h ++ return ++ fi ++ ++ echo "$CONFTEST_PREAMBLE ++ #include ++ void conftest_smp_call_function(void) { ++ smp_call_function(NULL, NULL, 0, 0); ++ }" > conftest$$.c ++ ++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 ++ rm -f conftest$$.c ++ ++ if [ -f conftest$$.o ]; then ++ rm -f conftest$$.o ++ echo "#define NV_SMP_CALL_FUNCTION_PRESENT" >> conftest.h ++ echo "#define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 4 " >> conftest.h ++ return ++ fi ++ ++ echo "$CONFTEST_PREAMBLE ++ #include ++ void conftest_smp_call_function(void) { ++ smp_call_function(NULL, NULL, 0); ++ }" > conftest$$.c ++ ++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 ++ rm -f conftest$$.c ++ ++ if [ -f conftest$$.o ]; then ++ rm -f conftest$$.o ++ echo "#define NV_SMP_CALL_FUNCTION_PRESENT" >> conftest.h ++ echo "#define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 3 " >> conftest.h ++ return ++ else ++ echo "#error smp_call_function() conftest failed!" >> conftest.h ++ fi ++ ;; ++ ++ on_each_cpu) ++ # ++ # Determine if the on_each_cpu() function is present ++ # and how many arguments it takes. ++ # ++ echo "$CONFTEST_PREAMBLE ++ #include ++ void conftest_on_each_cpu(void) { ++ #ifdef CONFIG_SMP ++ on_each_cpu(); ++ #endif ++ }" > conftest$$.c ++ ++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 ++ rm -f conftest$$.c ++ ++ if [ -f conftest$$.o ]; then ++ rm -f conftest$$.o ++ echo "#undef NV_ON_EACH_CPU" >> conftest.h ++ return ++ fi ++ ++ echo "$CONFTEST_PREAMBLE ++ #include ++ void conftest_on_each_cpu(void) { ++ on_each_cpu(NULL, NULL, 0, 0); ++ }" > conftest$$.c ++ ++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 ++ rm -f conftest$$.c ++ ++ if [ -f conftest$$.o ]; then ++ rm -f conftest$$.o ++ echo "#define NV_ON_EACH_CPU_PRESENT" >> conftest.h ++ echo "#define NV_ON_EACH_CPU_ARGUMENT_COUNT 4 " >> conftest.h ++ return ++ fi ++ ++ echo "$CONFTEST_PREAMBLE ++ #include ++ void conftest_on_each_cpu(void) { ++ on_each_cpu(NULL, NULL, 0); ++ }" > conftest$$.c ++ ++ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 ++ rm -f conftest$$.c ++ ++ if [ -f conftest$$.o ]; then ++ rm -f conftest$$.o ++ echo "#define NV_ON_EACH_CPU_PRESENT" >> conftest.h ++ echo "#define NV_ON_EACH_CPU_ARGUMENT_COUNT 3 " >> conftest.h ++ return ++ else ++ echo "#error on_each_cpu() conftest failed!" >> conftest.h ++ fi ++ ;; ++ + esac + } + +@@ -1278,11 +1392,21 @@ + # Run a series of compile tests to determine the set of interfaces + # and features available in the target kernel. + # ++ FILES="linux/semaphore.h" + shift 5 + + rm -f conftest.h + for i in $*; do compile_test $i; done + ++ for FILE in $FILES; do ++ FILE_DEFINE=NV_`echo $FILE | tr '/.' '_' | tr 'a-z' 'A-Z'`_PRESENT ++ if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then ++ echo "#define $FILE_DEFINE" >> conftest.h ++ else ++ echo "#undef $FILE_DEFINE" >> conftest.h ++ fi ++ done ++ + if [ -n "$SHOW_COMPILE_TEST_RESULTS" -a -f conftest.h ]; then + cat conftest.h + fi +diff -ur NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/nv-linux.h +--- NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/nv-linux.h 2008-07-17 20:42:29.000000000 -0500 ++++ NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/nv-linux.h 2008-08-11 18:36:50.000000000 -0500 +@@ -104,7 +104,11 @@ + #endif + + #include ++#if defined(NV_LINUX_SEMAPHORE_H_PRESENT) ++#include ++#else + #include ++#endif + #include + #include + +@@ -656,6 +660,46 @@ + + #endif /* !defined NVWATCH */ + ++#if defined(NV_SMP_CALL_FUNCTION_PRESENT) ++#if (NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT == 4) ++#define NV_SMP_CALL_FUNCTION(func, info, wait) \ ++ ({ \ ++ int __ret = smp_call_function(func, info, 1, wait); \ ++ __ret; \ ++ }) ++#elif (NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT == 3) ++#define NV_SMP_CALL_FUNCTION(func, info, wait) \ ++ ({ \ ++ int __ret = smp_call_function(func, info, wait); \ ++ __ret; \ ++ }) ++#else ++#error "NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT value unrecognized!" ++#endif ++#elif defined(CONFIG_SMP) ++#error "NV_SMP_CALL_FUNCTION() undefined (smp_call_function() unavailable)!" ++#endif ++ ++#if defined(NV_ON_EACH_CPU_PRESENT) ++#if (NV_ON_EACH_CPU_ARGUMENT_COUNT == 4) ++#define NV_ON_EACH_CPU(func, info, wait) \ ++ ({ \ ++ int __ret = on_each_cpu(func, info, 1, wait); \ ++ __ret; \ ++ }) ++#elif (NV_ON_EACH_CPU_ARGUMENT_COUNT == 3) ++#define NV_ON_EACH_CPU(func, info, wait) \ ++ ({ \ ++ int __ret = on_each_cpu(func, info, wait); \ ++ __ret; \ ++ }) ++#else ++#error "NV_ON_EACH_CPU_ARGUMENT_COUNT value unrecognized!" ++#endif ++#elif !defined(KERNEL_2_4) && defined(CONFIG_SMP) ++#error "NV_ON_EACH_CPU() undefined (on_each_cpu() unavailable)!" ++#endif ++ + static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info) + { + int ret = 0; +@@ -665,13 +709,13 @@ + #if defined(preempt_disable) + preempt_disable(); + #endif +- ret = smp_call_function(func, info, 1, 1); ++ ret = NV_SMP_CALL_FUNCTION(func, info, 1); + func(info); + #if defined(preempt_enable) + preempt_enable(); + #endif + #else +- ret = on_each_cpu(func, info, 1, 1); ++ ret = NV_ON_EACH_CPU(func, info, 1); + #endif + return ret; + } +diff -ur NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/nv.c NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/nv.c +--- NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/nv.c 2008-07-17 20:42:29.000000000 -0500 ++++ NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/nv.c 2008-08-11 18:44:36.000000000 -0500 +@@ -941,7 +941,7 @@ + + #if defined(CONFIG_HOTPLUG_CPU) + int cpu = (NvUPtr)info; +- if ((cpu != 0) && (cpu != smp_processor_id())) ++ if ((cpu != 0) && (cpu != (int)smp_processor_id())) + return; + #endif + +@@ -967,7 +967,7 @@ + + #if defined(CONFIG_HOTPLUG_CPU) + int cpu = (NvUPtr)info; +- if ((cpu != 0) && (cpu != smp_processor_id())) ++ if ((cpu != 0) && (cpu != (int)smp_processor_id())) + return; + #endif + +@@ -1194,8 +1194,7 @@ + unsigned int cachetype + ) + { +-#if defined(NV_CHANGE_PAGE_ATTR_PRESENT) || \ +- (defined(NV_SET_PAGES_UC_PRESENT) && !defined(NVCPU_X86)) ++#if defined(NV_CHANGE_PAGE_ATTR_PRESENT) + unsigned long retval = -1; + #if defined(NVCPU_X86) || defined(NVCPU_X86_64) + pgd_t *pgd = NULL; +@@ -1287,27 +1286,27 @@ + static int + nv_kern_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) + { +- int cpu = (NvUPtr)hcpu; ++ unsigned int cpu = get_cpu(); + + switch (action) + { + case CPU_DOWN_FAILED: + case CPU_ONLINE: +- if (get_cpu() == cpu) ++ if (cpu == (NvUPtr)hcpu) + __nv_setup_pat_entries(NULL); + else +- smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1); +- put_cpu(); ++ NV_SMP_CALL_FUNCTION(__nv_setup_pat_entries, hcpu, 1); + break; + case CPU_DOWN_PREPARE: +- if (get_cpu() == cpu) ++ if (cpu == (NvUPtr)hcpu) + __nv_restore_pat_entries(NULL); + else +- smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1); +- put_cpu(); +- break; ++ NV_SMP_CALL_FUNCTION(__nv_restore_pat_entries, hcpu, 1); ++ break; + } + ++ put_cpu(); ++ + return NOTIFY_OK; + } + +@@ -2856,12 +2855,7 @@ + nv_state_t *nv = (nv_state_t *) data; + nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv); + +- /* +- * XXX: This level of indirection is necessary to work around +- * problems with Linux kernels using a non-standard calling +- * convention, i.e. Arjan van de Ven's/RedHat's 2.6.0 kernels. +- */ +- NV_CHECK_PCI_CONFIG_SPACE(nvl->isr_bh_sp, nv, TRUE, TRUE, FALSE); ++ NV_CHECK_PCI_CONFIG_SPACE(nvl->isr_bh_sp, nv, TRUE, FALSE, FALSE); + + rm_isr_bh(nvl->isr_bh_sp, nv); + } +@@ -3520,7 +3514,7 @@ + BOOL kern + ) + { +-#if defined(NV_SET_PAGES_UC_PRESENT) && defined(NVCPU_X86) ++#if defined(NV_SET_PAGES_UC_PRESENT) + nv_printf(NV_DBG_ERRORS, + "NVRM: can't translate address in nv_get_phys_address()!\n"); + #else +@@ -4454,11 +4448,13 @@ + case PCI_D3hot: + nv_printf(NV_DBG_INFO, "NVRM: ACPI: received suspend event\n"); + ++ tasklet_disable(&lnv->tasklet); + status = rm_power_management(sp, nv, 0, power_state); + + nv_ext_suspend_bus(lnv->dev); + + __nv_disable_pat_support(); ++ tasklet_enable(&lnv->tasklet); + + break; + +diff -ur NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/os-interface.c NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/os-interface.c +--- NVIDIA-Linux-x86_64-173.14.12-pkg2.orig/usr/src/nv/os-interface.c 2008-07-17 20:42:29.000000000 -0500 ++++ NVIDIA-Linux-x86_64-173.14.12-pkg2/usr/src/nv/os-interface.c 2008-08-11 18:47:29.000000000 -0500 +@@ -48,7 +48,7 @@ + #endif + local_bh_disable(); + atomic_set(&os_smp_barrier, 1); +- ret = smp_call_function(ipi_handler, NULL, 1, 0); ++ ret = NV_SMP_CALL_FUNCTION(ipi_handler, NULL, 0); + #endif + return (ret == 0) ? RM_OK : RM_ERROR; + } +@@ -704,7 +704,7 @@ + U032 sig + ) + { +- return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK; ++ return RM_ERR_NOT_SUPPORTED; + } + + /*******************************************************************************/ +@@ -885,6 +885,23 @@ + { + struct pci_dev *dev; + unsigned int devfn = PCI_DEVFN(slot, function); ++ nv_state_t *nv; ++ ++ if (!NV_MAY_SLEEP()) ++ { ++ nv_printf(NV_DBG_ERRORS, ++ "NVRM: os_pci_init_handle: invalid context!\n"); ++ } ++ ++ if ((function == 0) && (bus != 255 && slot != 255)) ++ { ++ if ((nv = nv_get_adapter_state(bus, slot)) != NULL) ++ return nv->handle; ++ } ++ ++ if (!NV_MAY_SLEEP()) ++ return NULL; ++ + dev = NV_PCI_GET_SLOT(bus, devfn); + if (dev) { + if (vendor) *vendor = dev->vendor; diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.12-r2.broken b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.12-r2.ebuild similarity index 98% rename from x11-drivers/nvidia-drivers/nvidia-drivers-173.14.12-r2.broken rename to x11-drivers/nvidia-drivers/nvidia-drivers-173.14.12-r2.ebuild index b12246a..6779e6d 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.12-r2.broken +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.12-r2.ebuild @@ -223,10 +223,7 @@ src_unpack() { convert_to_m "${NV_SRC}"/Makefile.kbuild fi cd ${S}/usr/src/nv - epatch "${FILESDIR}"/mm-fix.patch - epatch "${FILESDIR}"/nv-173-post-2.6.26-update.patch - #epatch "${FILESDIR}"/nv-initmmfix.patch - Pointless. - #epatch "${FILESDIR}"/NV-177.13-new.patch - Baroque? + epatch "${FILESDIR}"/NV-173.14.12-new.patch } src_compile() { -- 2.11.4.GIT