Index: generic/include/mm/as.h
===================================================================
--- generic/include/mm/as.h	(revision de6b301a63efb6d81e9db05625bc3438102b9842)
+++ generic/include/mm/as.h	(revision d0cf9de049237d71e6744c625a19b4187c90a9ca)
@@ -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. */