diff --git a/[refs] b/[refs]
index f0c0743ac1cd..e165d11c5e88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b8aea74e78e977b1f9987e23e3e59f3ef4359f4
+refs/heads/master: 24a9ab7fa143498802b35c66de10cc3cfdac2c51
diff --git a/trunk/include/asm-xtensa/processor.h b/trunk/include/asm-xtensa/processor.h
index 4feb9f7f35a6..35145bcd96eb 100644
--- a/trunk/include/asm-xtensa/processor.h
+++ b/trunk/include/asm-xtensa/processor.h
@@ -33,7 +33,7 @@
  * the 1 GB requirement applies to the stack as well.
  */
 
-#define TASK_SIZE	0x40000000
+#define TASK_SIZE	__XTENSA_UL_CONST(0x40000000)
 
 /*
  * General exception cause assigned to debug exceptions. Debug exceptions go
diff --git a/trunk/include/asm-xtensa/types.h b/trunk/include/asm-xtensa/types.h
index 9d99a8e9e337..f1e84526f999 100644
--- a/trunk/include/asm-xtensa/types.h
+++ b/trunk/include/asm-xtensa/types.h
@@ -11,6 +11,15 @@
 #ifndef _XTENSA_TYPES_H
 #define _XTENSA_TYPES_H
 
+
+#ifdef __ASSEMBLY__
+# define __XTENSA_UL(x)		(x)
+# define __XTENSA_UL_CONST(x)	x
+#else
+# define __XTENSA_UL(x)		((unsigned long)(x))
+# define __XTENSA_UL_CONST(x)	x##UL
+#endif
+
 #ifndef __ASSEMBLY__
 
 typedef unsigned short umode_t;