Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision a1b9f63c506357f379bb6f1d9f633d5a740e941c)
+++ kernel/generic/src/mm/as.c	(revision e9d2905d090ff2994c1a8f2d7b4d0d4387d60ef7)
@@ -163,5 +163,5 @@
 		as->asid = ASID_INVALID;
 
-	atomic_set(&as->refcount, 0);
+	refcount_init(&as->refcount);
 	as->cpu_refcount = 0;
 
@@ -190,5 +190,5 @@
 
 	assert(as != AS);
-	assert(atomic_get(&as->refcount) == 0);
+	assert(refcount_unique(&as->refcount));
 
 	/*
@@ -267,5 +267,5 @@
 NO_TRACE void as_hold(as_t *as)
 {
-	atomic_inc(&as->refcount);
+	refcount_up(&as->refcount);
 }
 
@@ -275,10 +275,10 @@
  * destroys the address space.
  *
- * @param asAddress space to be released.
+ * @param as Address space to be released.
  *
  */
 NO_TRACE void as_release(as_t *as)
 {
-	if (atomic_predec(&as->refcount) == 0)
+	if (refcount_down(&as->refcount))
 		as_destroy(as);
 }