Index: generic/include/mm/as.h
===================================================================
--- generic/include/mm/as.h	(revision a82500ce45577f8d8eb985c998aee0e0223090c1)
+++ generic/include/mm/as.h	(revision 9295b0cfdf14b47adcdef065750baf781094aec6)
@@ -45,7 +45,5 @@
 #define IS_KA(addr)	((addr)>=KERNEL_ADDRESS_SPACE_START && (addr)<=KERNEL_ADDRESS_SPACE_END)
 
-#define UTEXT_ADDRESS	UTEXT_ADDRESS_ARCH
 #define USTACK_ADDRESS	USTACK_ADDRESS_ARCH
-#define UDATA_ADDRESS	UDATA_ADDRESS_ARCH
 
 #define FLAG_AS_KERNEL	    (1 << 0)	/**< Kernel address space. */