Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision 3489ea6b5368a6c4c644cfea5ff5babb268900d5)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 32318deb8d06b98437b9cfecdd25a6042f8d7927)
@@ -141,5 +141,5 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
 	extern "Cforall" {
-		thread_local volatile struct rseq __cfaabi_rseq;
+		// thread_local volatile struct rseq __cfaabi_rseq;
 	}
 #else
Index: libcfa/src/concurrency/kernel_private.hfa
===================================================================
--- libcfa/src/concurrency/kernel_private.hfa	(revision 3489ea6b5368a6c4c644cfea5ff5babb268900d5)
+++ libcfa/src/concurrency/kernel_private.hfa	(revision 32318deb8d06b98437b9cfecdd25a6042f8d7927)
@@ -30,5 +30,5 @@
 	#include <rseq/rseq.h>
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
-	#include <linux/rseq.h>
+	// #include <linux/rseq.h>
 #else
 	#ifndef _GNU_SOURCE
@@ -60,5 +60,5 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
 	extern "Cforall" {
-		extern __attribute__((aligned(128))) thread_local volatile struct rseq __cfaabi_rseq;
+		// extern __attribute__((aligned(128))) thread_local volatile struct rseq __cfaabi_rseq;
 	}
 #else
@@ -71,5 +71,5 @@
 	return rseq_current_cpu_raw();
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
-	return __cfaabi_rseq.cpu_id;
+	// return __cfaabi_rseq.cpu_id;
 #else
 	return sched_getcpu();