Index: arch/sparc64/include/mm/as.h
===================================================================
--- arch/sparc64/include/mm/as.h	(revision de6b301a63efb6d81e9db05625bc3438102b9842)
+++ 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 de6b301a63efb6d81e9db05625bc3438102b9842)
+++ 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;