From c99d72a2315012780beb3467754a56a5118debc6 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sun, 3 Feb 2008 14:22:18 +0300
Subject: [PATCH] --- yaml --- r: 91352 b: refs/heads/master c:
 e573ebb0326f2f4a29ee2bd143bfc88ab0332926 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-avr32/page.h | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 71fef572cf24..fec915084624 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a4e832cccc5baba98ba010e38c58266954228a7
+refs/heads/master: e573ebb0326f2f4a29ee2bd143bfc88ab0332926
diff --git a/trunk/include/asm-avr32/page.h b/trunk/include/asm-avr32/page.h
index 5582968feee8..cbbc5ca9728b 100644
--- a/trunk/include/asm-avr32/page.h
+++ b/trunk/include/asm-avr32/page.h
@@ -8,13 +8,11 @@
 #ifndef __ASM_AVR32_PAGE_H
 #define __ASM_AVR32_PAGE_H
 
+#include <linux/const.h>
+
 /* 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_SIZE	(_AC(1, UL) << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 #define PTE_MASK	PAGE_MASK