Index: libcfa/src/concurrency/io/setup.cfa
===================================================================
--- libcfa/src/concurrency/io/setup.cfa	(revision 708ae384ef22961b8c1c67282cb1dc6024011687)
+++ libcfa/src/concurrency/io/setup.cfa	(revision 51239d1bcb080220bfd945121b0fc26dce06311a)
@@ -115,5 +115,5 @@
 		this.ext_sq.empty = true;
 		(this.ext_sq.queue){};
-		__io_uring_setup( this, cl.io.params, proc->idle_fd );
+		__io_uring_setup( this, cl.io.params, proc->idle_wctx.evfd );
 		__cfadbg_print_safe(io_core, "Kernel I/O : Created ring for io_context %u (%p)\n", this.fd, &this);
 	}
@@ -125,7 +125,4 @@
 		__cfadbg_print_safe(io_core, "Kernel I/O : Destroyed ring for io_context %u\n", this.fd);
 	}
-
-	extern void __disable_interrupts_hard();
-	extern void __enable_interrupts_hard();
 
 	static void __io_uring_setup( $io_context & this, const io_context_params & params_in, int procfd ) {
@@ -230,12 +227,8 @@
 			__cfadbg_print_safe(io_core, "Kernel I/O : registering %d for completion with ring %d\n", procfd, fd);
 
-			__disable_interrupts_hard();
-
 			int ret = syscall( __NR_io_uring_register, fd, IORING_REGISTER_EVENTFD, &procfd, 1);
 			if (ret < 0) {
 				abort("KERNEL ERROR: IO_URING EVENTFD REGISTER - %s\n", strerror(errno));
 			}
-
-			__enable_interrupts_hard();
 
 			__cfadbg_print_safe(io_core, "Kernel I/O : registered %d for completion with ring %d\n", procfd, fd);