From: Haavard Skinnemoen <hskinnemoen@atmel.com>

As pointed out by Dave Hansen, we should really use linux/pfn.h
instead of our own PFN_UP/PFN_DOWN/PFN_PHYS definitions.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/avr32/mm/init.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff -puN arch/avr32/mm/init.c~avr32-use-linux-pfnh arch/avr32/mm/init.c
--- a/arch/avr32/mm/init.c~avr32-use-linux-pfnh
+++ a/arch/avr32/mm/init.c
@@ -14,6 +14,7 @@
 #include <linux/mmzone.h>
 #include <linux/bootmem.h>
 #include <linux/pagemap.h>
+#include <linux/pfn.h>
 #include <linux/nodemask.h>
 
 #include <asm/page.h>
@@ -90,10 +91,6 @@ static void __init print_memory_map(cons
 	}
 }
 
-#define PFN_UP(x)	(((x) + PAGE_SIZE - 1) >> PAGE_SHIFT)
-#define PFN_DOWN(x)	((x) >> PAGE_SHIFT)
-#define PFN_PHYS(x)	((x) << PAGE_SHIFT)
-
 #define MAX_LOWMEM	HIGHMEM_START
 #define MAX_LOWMEM_PFN	PFN_DOWN(MAX_LOWMEM)
 
_