[PATCH] unify PFN_* macros

[linux-2.6-omap-h63xx.git] / arch / arm26 / mm / init.c

diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
index e3ecaa4537478d8cb8c9f47f114f9eae76d46228..7da8a520567874d13f8f6ee619e56ac52d7e9317 100644 (file)
--- a/arch/arm26/mm/init.c
+++ b/arch/arm26/mm/init.c
@@ -23,6 +23,7 @@
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
 #include <linux/blkdev.h>
+#include <linux/pfn.h>
 
 #include <asm/segment.h>
 #include <asm/mach-types.h>
@@ -101,12 +102,6 @@ struct node_info {
        int bootmap_pages;
 };
 
-#define PFN_DOWN(x)    ((x) >> PAGE_SHIFT)
-#define PFN_UP(x)      (PAGE_ALIGN(x) >> PAGE_SHIFT)
-#define PFN_SIZE(x)    ((x) >> PAGE_SHIFT)
-#define PFN_RANGE(s,e) PFN_SIZE(PAGE_ALIGN((unsigned long)(e)) - \
-                               (((unsigned long)(s)) & PAGE_MASK))
-
 /*
  * FIXME: We really want to avoid allocating the bootmap bitmap
  * over the top of the initrd.  Hopefully, this is located towards