Index: arch/amd64/include/mm/as.h
===================================================================
--- arch/amd64/include/mm/as.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ arch/amd64/include/mm/as.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -37,7 +37,5 @@
 #define USER_ADDRESS_SPACE_END_ARCH		(__address) 0x00007fffffffffff
 
-#define UTEXT_ADDRESS_ARCH	0x00001000
 #define USTACK_ADDRESS_ARCH	(USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
-#define UDATA_ADDRESS_ARCH	0x21000000
 
 #define as_install_arch(as)
Index: arch/ia32/include/mm/as.h
===================================================================
--- arch/ia32/include/mm/as.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ arch/ia32/include/mm/as.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -37,7 +37,5 @@
 #define USER_ADDRESS_SPACE_END_ARCH		((__address) 0x7fffffff)
 
-#define UTEXT_ADDRESS_ARCH	0x00001000
 #define USTACK_ADDRESS_ARCH	(USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
-#define UDATA_ADDRESS_ARCH	0x21000000
 
 #define as_install_arch(as)
Index: arch/ia64/include/mm/as.h
===================================================================
--- arch/ia64/include/mm/as.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ arch/ia64/include/mm/as.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -37,7 +37,5 @@
 #define USER_ADDRESS_SPACE_END_ARCH		(__address) 0xdfffffffffffffffULL
 
-#define UTEXT_ADDRESS_ARCH	0x0000000000010000ULL
 #define USTACK_ADDRESS_ARCH	0x0000000ff0000000ULL
-#define UDATA_ADDRESS_ARCH	0x0000000001010000ULL
 
 extern void as_arch_init(void);
Index: arch/mips32/include/mm/as.h
===================================================================
--- arch/mips32/include/mm/as.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ arch/mips32/include/mm/as.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -38,7 +38,5 @@
 #define USER_ADDRESS_SPACE_END_ARCH		(__address) 0x7fffffff	
 
-#define UTEXT_ADDRESS_ARCH	0x00004000
 #define USTACK_ADDRESS_ARCH	(0x80000000-PAGE_SIZE)
-#define UDATA_ADDRESS_ARCH	0x01001000
 
 extern void as_arch_init(void);
Index: arch/ppc32/include/mm/as.h
===================================================================
--- arch/ppc32/include/mm/as.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ arch/ppc32/include/mm/as.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -37,7 +37,5 @@
 #define USER_ADDRESS_SPACE_END_ARCH		(__address) 0x7fffffff
 
-#define UTEXT_ADDRESS_ARCH	0x00001000
 #define USTACK_ADDRESS_ARCH	(0x7fffffff-(PAGE_SIZE-1))
-#define UDATA_ADDRESS_ARCH	0x21000000
 
 #define as_install_arch(as)
Index: arch/sparc64/include/mm/as.h
===================================================================
--- arch/sparc64/include/mm/as.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ arch/sparc64/include/mm/as.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -37,7 +37,5 @@
 #define USER_ADDRESS_SPACE_END_ARCH		(__address) 0xffffffffffffffff
 
-#define UTEXT_ADDRESS_ARCH	(0x0000000000000000+PAGE_SIZE)
 #define USTACK_ADDRESS_ARCH	(0x7fffffffffffffff-(PAGE_SIZE-1))
-#define UDATA_ADDRESS_ARCH	0x8000000000000000
 
 #define as_install_arch(as)
Index: arch/sparc64/include/types.h
===================================================================
--- arch/sparc64/include/types.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ arch/sparc64/include/types.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -33,4 +33,7 @@
 
 typedef signed char __s8;
+typedef signed short __s16;
+typedef signed int __s32;
+typedef signed long __s64;
 
 typedef unsigned char __u8;
Index: generic/include/mm/as.h
===================================================================
--- generic/include/mm/as.h	(revision f972b898f20ebc3822b229dff027981b45f88559)
+++ generic/include/mm/as.h	(revision f7ea8fab193904c8fb98dc5ae80e55c0da346a8f)
@@ -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. */