Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision ad211c849e7c6874c1c3f6ce9695684e0420bd95)
+++ kernel/generic/src/syscall/syscall.c	(revision 11909ce3e9ef283a8861cf0ab4dac3ee0e36f170)
@@ -141,7 +141,7 @@
 {
 	/* Do userpace accounting */
-	irq_spinlock_lock(&THREAD->lock, true);
+	ipl_t ipl = interrupts_disable();
 	thread_update_accounting(true);
-	irq_spinlock_unlock(&THREAD->lock, true);
+	interrupts_restore(ipl);
 
 #ifdef CONFIG_UDEBUG
@@ -191,7 +191,7 @@
 
 	/* Do kernel accounting */
-	irq_spinlock_lock(&THREAD->lock, true);
+	ipl = interrupts_disable();
 	thread_update_accounting(false);
-	irq_spinlock_unlock(&THREAD->lock, true);
+	interrupts_restore(ipl);
 
 	return rc;