Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision c98e6ee244a8e271a395a052069c23bca4f8b538)
+++ kernel/generic/src/mm/as.c	(revision 677f6201e4a3431c59769072f16bf8689cd8452c)
@@ -83,5 +83,4 @@
 #endif /* CONFIG_VIRT_IDX_DCACHE */
 
-#ifndef __OBJC__
 /**
  * Each architecture decides what functions will be used to carry out
@@ -94,5 +93,4 @@
  */
 static slab_cache_t *as_slab;
-#endif
 
 /**
@@ -120,5 +118,4 @@
 static void sh_info_remove_reference(share_info_t *sh_info);
 
-#ifndef __OBJC__
 static int as_constructor(void *obj, int flags)
 {
@@ -140,5 +137,4 @@
 	return as_destructor_arch(as);
 }
-#endif
 
 /** Initialize address space subsystem. */
@@ -147,8 +143,6 @@
 	as_arch_init();
 
-#ifndef __OBJC__
 	as_slab = slab_cache_create("as_slab", sizeof(as_t), 0,
 	    as_constructor, as_destructor, SLAB_CACHE_MAGDEFERRED);
-#endif
 	
 	AS_KERNEL = as_create(FLAG_AS_KERNEL);
@@ -166,12 +160,5 @@
 	as_t *as;
 
-#ifdef __OBJC__
-	as = [as_t new];
-	link_initialize(&as->inactive_as_with_asid_link);
-	mutex_initialize(&as->lock, MUTEX_PASSIVE);	
-	(void) as_constructor_arch(as, flags);
-#else
 	as = (as_t *) slab_alloc(as_slab, 0);
-#endif
 	(void) as_create_arch(as, 0);
 	
@@ -264,9 +251,5 @@
 	interrupts_restore(ipl);
 
-#ifdef __OBJC__
-	[as free];
-#else
 	slab_free(as_slab, as);
-#endif
 }
 
@@ -1164,12 +1147,8 @@
 pte_t *page_table_create(int flags)
 {
-#ifdef __OBJC__
-	return [as_t page_table_create: flags];
-#else
 	ASSERT(as_operations);
 	ASSERT(as_operations->page_table_create);
 	
 	return as_operations->page_table_create(flags);
-#endif
 }
 
@@ -1182,12 +1161,8 @@
 void page_table_destroy(pte_t *page_table)
 {
-#ifdef __OBJC__
-	return [as_t page_table_destroy: page_table];
-#else
 	ASSERT(as_operations);
 	ASSERT(as_operations->page_table_destroy);
 	
 	as_operations->page_table_destroy(page_table);
-#endif
 }
 
@@ -1206,12 +1181,8 @@
 void page_table_lock(as_t *as, bool lock)
 {
-#ifdef __OBJC__
-	[as page_table_lock: lock];
-#else
 	ASSERT(as_operations);
 	ASSERT(as_operations->page_table_lock);
 	
 	as_operations->page_table_lock(as, lock);
-#endif
 }
 
@@ -1223,12 +1194,8 @@
 void page_table_unlock(as_t *as, bool unlock)
 {
-#ifdef __OBJC__
-	[as page_table_unlock: unlock];
-#else
 	ASSERT(as_operations);
 	ASSERT(as_operations->page_table_unlock);
 	
 	as_operations->page_table_unlock(as, unlock);
-#endif
 }