Index: libcfa/src/concurrency/kernel/cluster.cfa
===================================================================
--- libcfa/src/concurrency/kernel/cluster.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
+++ libcfa/src/concurrency/kernel/cluster.cfa	(revision a8667ab4f3e80cd87485f88307c47abba3c35cb7)
@@ -69,23 +69,4 @@
 }
 
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-	// No forward declaration needed
-	#define __kernel_rseq_register rseq_register_current_thread
-	#define __kernel_rseq_unregister rseq_unregister_current_thread
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-	static void __kernel_raw_rseq_register  (void);
-	static void __kernel_raw_rseq_unregister(void);
-
-	#define __kernel_rseq_register __kernel_raw_rseq_register
-	#define __kernel_rseq_unregister __kernel_raw_rseq_unregister
-#else
-	// No forward declaration needed
-	// No initialization needed
-	static inline void noop(void) {}
-
-	#define __kernel_rseq_register noop
-	#define __kernel_rseq_unregister noop
-#endif
-
 //=======================================================================
 // Cluster wide reader-writer lock
@@ -110,6 +91,4 @@
 // Lock-Free registering/unregistering of threads
 unsigned register_proc_id( void ) with(__scheduler_lock.lock) {
-	__kernel_rseq_register();
-
 	bool * handle = (bool *)&kernelTLS().sched_lock;
 
@@ -161,6 +140,4 @@
 
 	__atomic_store_n(cell, 0p, __ATOMIC_RELEASE);
-
-	__kernel_rseq_unregister();
 }
 
@@ -504,58 +481,2 @@
 	/* paranoid */ verify( mock_head(this)    == this.l.prev );
 }
-
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-	// No definition needed
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-
-	#if defined( __x86_64 ) || defined( __i386 )
-		#define RSEQ_SIG	0x53053053
-	#elif defined( __ARM_ARCH )
-		#ifdef __ARMEB__
-		#define RSEQ_SIG    0xf3def5e7      /* udf    #24035    ; 0x5de3 (ARMv6+) */
-		#else
-		#define RSEQ_SIG    0xe7f5def3      /* udf    #24035    ; 0x5de3 */
-		#endif
-	#endif
-
-	extern void __disable_interrupts_hard();
-	extern void __enable_interrupts_hard();
-
-	static void __kernel_raw_rseq_register  (void) {
-		/* paranoid */ verify( __cfaabi_rseq.cpu_id == RSEQ_CPU_ID_UNINITIALIZED );
-
-		// int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), 0, (sigset_t *)0p, _NSIG / 8);
-		int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), 0, RSEQ_SIG);
-		if(ret != 0) {
-			int e = errno;
-			switch(e) {
-			case EINVAL: abort("KERNEL ERROR: rseq register invalid argument");
-			case ENOSYS: abort("KERNEL ERROR: rseq register no supported");
-			case EFAULT: abort("KERNEL ERROR: rseq register with invalid argument");
-			case EBUSY : abort("KERNEL ERROR: rseq register already registered");
-			case EPERM : abort("KERNEL ERROR: rseq register sig  argument  on unregistration does not match the signature received on registration");
-			default: abort("KERNEL ERROR: rseq register unexpected return %d", e);
-			}
-		}
-	}
-
-	static void __kernel_raw_rseq_unregister(void) {
-		/* paranoid */ verify( __cfaabi_rseq.cpu_id >= 0 );
-
-		// int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, (sigset_t *)0p, _NSIG / 8);
-		int ret = syscall(__NR_rseq, &__cfaabi_rseq, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, RSEQ_SIG);
-		if(ret != 0) {
-			int e = errno;
-			switch(e) {
-			case EINVAL: abort("KERNEL ERROR: rseq unregister invalid argument");
-			case ENOSYS: abort("KERNEL ERROR: rseq unregister no supported");
-			case EFAULT: abort("KERNEL ERROR: rseq unregister with invalid argument");
-			case EBUSY : abort("KERNEL ERROR: rseq unregister already registered");
-			case EPERM : abort("KERNEL ERROR: rseq unregister sig  argument  on unregistration does not match the signature received on registration");
-			default: abort("KERNEL ERROR: rseq unregisteunexpected return %d", e);
-			}
-		}
-	}
-#else
-	// No definition needed
-#endif
Index: libcfa/src/concurrency/kernel/private.hfa
===================================================================
--- libcfa/src/concurrency/kernel/private.hfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
+++ libcfa/src/concurrency/kernel/private.hfa	(revision a8667ab4f3e80cd87485f88307c47abba3c35cb7)
@@ -10,6 +10,6 @@
 // Created On       : Mon Feb 13 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 12 08:21:33 2020
-// Update Count     : 9
+// Last Modified On : Thu Mar  2 16:04:46 2023
+// Update Count     : 11
 //
 
@@ -29,14 +29,5 @@
 
 extern "C" {
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-	#include <rseq/rseq.h>
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-	#include <linux/rseq.h>
-#else
-	#ifndef _GNU_SOURCE
-	#error kernel/private requires gnu_source
-	#endif
 	#include <sched.h>
-#endif
 }
 
@@ -110,25 +101,7 @@
 // Hardware
 
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-	// No data needed
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-	extern "Cforall" {
-		extern __attribute__((aligned(64))) __thread volatile struct rseq __cfaabi_rseq;
-	}
-#else
-	// No data needed
-#endif
-
 static inline int __kernel_getcpu() {
 	/* paranoid */ verify( ! __preemption_enabled() );
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-	return rseq_current_cpu();
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-	int r = __cfaabi_rseq.cpu_id;
-	/* paranoid */ verify( r >= 0 );
-	return r;
-#else
 	return sched_getcpu();
-#endif
 }
 
Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision aca0d2f510429843eb53e3fd4cb1160ade5d68d3)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision a8667ab4f3e80cd87485f88307c47abba3c35cb7)
@@ -147,16 +147,4 @@
 __scheduler_RWLock_t __scheduler_lock @= { 0 };
 
-#if   defined(CFA_HAVE_LINUX_LIBRSEQ)
-	// No data needed
-#elif defined(CFA_HAVE_LINUX_RSEQ_H)
-	extern "Cforall" {
-		__attribute__((aligned(64))) __thread volatile struct rseq __cfaabi_rseq @= {
-			.cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
-		};
-	}
-#else
-	// No data needed
-#endif
-
 //-----------------------------------------------------------------------------
 // Struct to steal stack