Index: arch/amd64/include/mm/as.h
===================================================================
--- arch/amd64/include/mm/as.h	(revision d0c59014273d37ae8d8218bc43b145fd27e12bb6)
+++ arch/amd64/include/mm/as.h	(revision c034b164fce2965ed6484d251876ad7e153978a3)
@@ -32,8 +32,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH	0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH		(__address) 0xffff800000000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH		(__address) 0xffffffffffffffff
-#define USER_ADDRESS_SPACE_START_ARCH		(__address) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH		(__address) 0x00007fffffffffff
+#define KERNEL_ADDRESS_SPACE_START_ARCH		(unsigned long) 0xffff800000000000
+#define KERNEL_ADDRESS_SPACE_END_ARCH		(unsigned long) 0xffffffffffffffff
+#define USER_ADDRESS_SPACE_START_ARCH		(unsigned long) 0x0000000000000000
+#define USER_ADDRESS_SPACE_END_ARCH		(unsigned long) 0x00007fffffffffff
 
 #define USTACK_ADDRESS_ARCH	(USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
Index: arch/ia32/include/mm/as.h
===================================================================
--- arch/ia32/include/mm/as.h	(revision d0c59014273d37ae8d8218bc43b145fd27e12bb6)
+++ arch/ia32/include/mm/as.h	(revision c034b164fce2965ed6484d251876ad7e153978a3)
@@ -32,8 +32,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH	0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH		((__address) 0x80000000)
-#define KERNEL_ADDRESS_SPACE_END_ARCH		((__address) 0xffffffff)
-#define USER_ADDRESS_SPACE_START_ARCH		((__address) 0x00000000)
-#define USER_ADDRESS_SPACE_END_ARCH		((__address) 0x7fffffff)
+#define KERNEL_ADDRESS_SPACE_START_ARCH		((unsigned long) 0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH		((unsigned long) 0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH		((unsigned long) 0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH		((unsigned long) 0x7fffffff)
 
 #define USTACK_ADDRESS_ARCH	(USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
Index: arch/ia64/include/mm/as.h
===================================================================
--- arch/ia64/include/mm/as.h	(revision d0c59014273d37ae8d8218bc43b145fd27e12bb6)
+++ arch/ia64/include/mm/as.h	(revision c034b164fce2965ed6484d251876ad7e153978a3)
@@ -32,8 +32,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH	0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH		(__address) 0xe000000000000000ULL
-#define KERNEL_ADDRESS_SPACE_END_ARCH		(__address) 0xffffffffffffffffULL
-#define USER_ADDRESS_SPACE_START_ARCH		(__address) 0x0000000000000000ULL
-#define USER_ADDRESS_SPACE_END_ARCH		(__address) 0xdfffffffffffffffULL
+#define KERNEL_ADDRESS_SPACE_START_ARCH		(unsigned long) 0xe000000000000000ULL
+#define KERNEL_ADDRESS_SPACE_END_ARCH		(unsigned long) 0xffffffffffffffffULL
+#define USER_ADDRESS_SPACE_START_ARCH		(unsigned long) 0x0000000000000000ULL
+#define USER_ADDRESS_SPACE_END_ARCH		(unsigned long) 0xdfffffffffffffffULL
 
 #define USTACK_ADDRESS_ARCH	0x0000000ff0000000ULL
Index: arch/mips32/include/mm/as.h
===================================================================
--- arch/mips32/include/mm/as.h	(revision d0c59014273d37ae8d8218bc43b145fd27e12bb6)
+++ arch/mips32/include/mm/as.h	(revision c034b164fce2965ed6484d251876ad7e153978a3)
@@ -32,8 +32,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH	0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH		(__address) 0x80000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH		(__address) 0xffffffff
-#define USER_ADDRESS_SPACE_START_ARCH		(__address) 0x00000000
-#define USER_ADDRESS_SPACE_END_ARCH		(__address) 0x7fffffff	
+#define KERNEL_ADDRESS_SPACE_START_ARCH		(unsigned long) 0x80000000
+#define KERNEL_ADDRESS_SPACE_END_ARCH		(unsigned long) 0xffffffff
+#define USER_ADDRESS_SPACE_START_ARCH		(unsigned long) 0x00000000
+#define USER_ADDRESS_SPACE_END_ARCH		(unsigned long) 0x7fffffff
 
 #define USTACK_ADDRESS_ARCH	(0x80000000-PAGE_SIZE)
Index: arch/ppc32/include/mm/as.h
===================================================================
--- arch/ppc32/include/mm/as.h	(revision d0c59014273d37ae8d8218bc43b145fd27e12bb6)
+++ arch/ppc32/include/mm/as.h	(revision c034b164fce2965ed6484d251876ad7e153978a3)
@@ -32,8 +32,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH	0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH		((__address) 0x80000000)
-#define KERNEL_ADDRESS_SPACE_END_ARCH		((__address) 0xffffffff)
-#define USER_ADDRESS_SPACE_START_ARCH		((__address) 0x00000000)
-#define USER_ADDRESS_SPACE_END_ARCH		((__address) 0x7fffffff)
+#define KERNEL_ADDRESS_SPACE_START_ARCH		((unsigned long) 0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH		((unsigned long) 0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH		((unsigned long) 0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH		((unsigned long) 0x7fffffff)
 
 #define USTACK_ADDRESS_ARCH	(0x7fffffff-(PAGE_SIZE-1))
Index: arch/ppc64/include/mm/as.h
===================================================================
--- arch/ppc64/include/mm/as.h	(revision d0c59014273d37ae8d8218bc43b145fd27e12bb6)
+++ arch/ppc64/include/mm/as.h	(revision c034b164fce2965ed6484d251876ad7e153978a3)
@@ -32,8 +32,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH	0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH		((__address) 0x80000000)
-#define KERNEL_ADDRESS_SPACE_END_ARCH		((__address) 0xffffffff)
-#define USER_ADDRESS_SPACE_START_ARCH		((__address) 0x00000000)
-#define USER_ADDRESS_SPACE_END_ARCH		((__address) 0x7fffffff)
+#define KERNEL_ADDRESS_SPACE_START_ARCH		((unsigned long) 0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH		((unsigned long) 0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH		((unsigned long) 0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH		((unsigned long) 0x7fffffff)
 
 #define USTACK_ADDRESS_ARCH	(0x7fffffff-(PAGE_SIZE-1))
Index: arch/sparc64/include/mm/as.h
===================================================================
--- arch/sparc64/include/mm/as.h	(revision d0c59014273d37ae8d8218bc43b145fd27e12bb6)
+++ arch/sparc64/include/mm/as.h	(revision c034b164fce2965ed6484d251876ad7e153978a3)
@@ -32,8 +32,8 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH	1
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH		(__address) 0x0000000000000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH		(__address) 0xffffffffffffffff
-#define USER_ADDRESS_SPACE_START_ARCH		(__address) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH		(__address) 0xffffffffffffffff
+#define KERNEL_ADDRESS_SPACE_START_ARCH		(unsigned long) 0x0000000000000000
+#define KERNEL_ADDRESS_SPACE_END_ARCH		(unsigned long) 0xffffffffffffffff
+#define USER_ADDRESS_SPACE_START_ARCH		(unsigned long) 0x0000000000000000
+#define USER_ADDRESS_SPACE_END_ARCH		(unsigned long) 0xffffffffffffffff
 
 #define USTACK_ADDRESS_ARCH	(0x7fffffffffffffff-(PAGE_SIZE-1))
