diff --git a/[refs] b/[refs]
index d30cc97b2912..88b96de20faa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28ccf7f91b1ac42ee1f18480a69d2a7486b625ce
+refs/heads/master: 8c12b5dc13bf8516303a8224ab4e9708b33d5b00
diff --git a/trunk/include/asm-sh/page.h b/trunk/include/asm-sh/page.h
index 888d6fe0030e..acf6977b4042 100644
--- a/trunk/include/asm-sh/page.h
+++ b/trunk/include/asm-sh/page.h
@@ -16,7 +16,13 @@
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT	12
+
+#ifdef __ASSEMBLY__
 #define PAGE_SIZE	(1 << PAGE_SHIFT)
+#else
+#define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#endif
+
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 #define PTE_MASK	PAGE_MASK