gentoo auto-resync : 27:07:2022 - 15:01:59

2 files changed, 0 insertions, 59 deletions

diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index 23113b15be48..cfae2d5c4440 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1,5 +1,4 @@
 AUX 45-knem.rules 28 BLAKE2B 4f7eb2b4c84bc786998ac8ad610626b6ca3e384777aeecd7bb18fb657ff095f7311670bb388d6e7c5f1da944428d6d088bd65d333d27cf67f3d1d532354aaaf6 SHA512 fc819a12ad7432cbf08450ebc36b469402753d8d363d72a46b71efb916391d320591eac0be9498a37a7bbc5ebe1b2725a2cbf37c7c69ed7d5c6e1ccf9ce0e51b
-AUX knem-1.1.3-setup_timer.patch 1965 BLAKE2B b70774ca235d159c4054a496e23e7e5205f504815878b0045ff80f91f7cda1fb3748d1fde16a6da6c6c67f2d8acfc4310a7e0cfa3ad1d461b89bc73d41af8f10 SHA512 ab87faded049f999638d4092a9758a542836e2c373c43e4f00141f54b8aa38ab2bbd288edf95a67f087b949864e4a00163cf2eff13f2b41a71677b72c4f9eb01
 DIST knem-1.1.4.tar.gz 336148 BLAKE2B e7273040c563c63e5e5c1a4a6b822a4b34b6fbb7214a7a37b4ff06f23aa47fe80c55ed1781ce85d974ed7e53059b509db98a94baaa7bddfc8860d503cf89869d SHA512 4f142a910ac51a590952aa1f36010fc2a1361162a0d5fd98f47d1c90dedbb293d56bd990bded5d4ec91fcc8df3fa3bcf0d126651b5868c557ffb9f3a588cb948
 EBUILD knem-1.1.4.ebuild 1700 BLAKE2B 2f3a58da4ce9cf41126533e2d4f575c3b3b7f9153ea019fbf284b816ee096006c657984b8bf214be027b03cd4ab505ce260f321e6bfe20a0e1973820c1e9444c SHA512 a25ee03c40cd49975d171c173cdb1a8cdaf2d3306dee745731b4900b90b6b46a8859d1b289edcd2007efe614a58b2c8aeb8a3fd579383b34ab625eb178dcbc5f
 EBUILD knem-9999.ebuild 1689 BLAKE2B a3284ba6a06d6a365e6f6132a6944f01387c2099900eec2cd7f72737fa3ccb7a6221648e8d6c80b41a438121b64d157e8c26fee7a6652f98f3c70ba76ff76776 SHA512 69fbeb500f0b1aec968c1800d78af94180dbff674e4241a32402d41539e8e1a07b01c383436ed93e07b751f06969f06695433308faa5fa41f87712d5e98eabd5
diff --git a/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch b/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch
deleted file mode 100644
index eb418ccc957a..000000000000
--- a/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/driver/linux/check_kernel_headers.sh b/driver/linux/check_kernel_headers.sh
-index b0b9b851c0a1..7afec9fae138 100755
---- a/driver/linux/check_kernel_headers.sh
-+++ b/driver/linux/check_kernel_headers.sh
-@@ -330,6 +330,19 @@ else
-   echo no
- fi
- 
-+# timer_setup() added in v4.14-rc3
-+echo -n "  checking (in kernel headers) timer_setup() availability ... "
-+if test -e ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
-+  if grep timer_setup ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
-+    echo "#define HAVE_TIMER_SETUP 1" >> ${TMP_CHECKS_NAME}
-+    echo yes
-+  else
-+    echo no
-+  fi
-+else
-+  echo no
-+fi
-+
- # add the footer
- echo "" >> ${TMP_CHECKS_NAME}
- echo "#endif /* __knem_checks_h__ */" >> ${TMP_CHECKS_NAME}
-diff --git a/driver/linux/knem_main.c b/driver/linux/knem_main.c
-index e12aad3c0ea5..ddae2af14449 100644
---- a/driver/linux/knem_main.c
-+++ b/driver/linux/knem_main.c
-@@ -2610,9 +2610,17 @@ knem_kthread_func(void *data)
- 
- #ifdef KNEM_HAVE_DMA_ENGINE
- static void
-+#ifdef HAVE_TIMER_SETUP
-+knem_dmacpy_cleanup_timer_handler(struct timer_list *t)
-+#else
- knem_dmacpy_cleanup_timer_handler(unsigned long data)
-+#endif
- {
-+#ifdef HAVE_TIMER_SETUP
-+	struct knem_context * ctx = from_timer(ctx, t, dmacpy_cleanup_timer);
-+#else
- 	struct knem_context * ctx = (void *) data;
-+#endif
- 
- 	wake_up(&ctx->kthread_work_wq);
- 	knem_counter_inc(DMACPY_CLEANUP_TIMEOUT);
-@@ -2665,7 +2673,11 @@ knem_miscdev_open(struct inode * inode, struct file * file)
- 	if (ctx->dmacpy_chan) {
- 		INIT_LIST_HEAD(&ctx->dmacpy_cleanup_work_list);
- 		spin_lock_init(&ctx->dmacpy_cleanup_work_lock);
-+#ifdef HAVE_TIMER_SETUP
-+		timer_setup(&ctx->dmacpy_cleanup_timer, knem_dmacpy_cleanup_timer_handler, 0);
-+#else
- 		setup_timer(&ctx->dmacpy_cleanup_timer, knem_dmacpy_cleanup_timer_handler, (unsigned long) ctx);
-+#endif
- #if (defined CONFIG_NUMA) && (defined KNEM_HAVE_CPUMASK_OF_NODE)
- 		{
- 			int node = dev_to_node(ctx->dmacpy_chan->device->dev);