From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sun, 3 Feb 2008 11:22:18 +0000 (+0300)
Subject: avr32: cleanup - use _AC macro to define PAGE_SIZE
X-Git-Tag: v2.6.26-rc1~1128^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e573ebb0326f2f4a29ee2bd143bfc88ab0332926;p=linux-2.6-omap-h63xx.git

avr32: cleanup - use _AC macro to define PAGE_SIZE

PAGE_SIZE is used both from assembly and C code. We want to have type
specifiers when using it from C, but this will make the assembler
confused, so we need to make it conditional.

This is exactly what the _AC macro is for, so using it allows us to
get rid of a few lines of cpp noise.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---

diff --git a/include/asm-avr32/page.h b/include/asm-avr32/page.h
index 5582968feee..cbbc5ca9728 100644
--- a/include/asm-avr32/page.h
+++ b/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