generic: make PFN_PHYS explicitly return phys_addr_t

[linux-2.6-omap-h63xx.git] / include / linux / pfn.h

diff --git a/include/linux/pfn.h b/include/linux/pfn.h
index bb01f8b92b56208bf7b433d842f7d0821647e691..7646637221f3ac45b0e2f9381fd733950b6ff492 100644 (file)
--- a/include/linux/pfn.h
+++ b/include/linux/pfn.h
@@ -1,9 +1,13 @@
 #ifndef _LINUX_PFN_H_
 #define _LINUX_PFN_H_
 
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+#endif
+
 #define PFN_ALIGN(x)   (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
 #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 PFN_PHYS(x)    ((phys_addr_t)(x) << PAGE_SHIFT)
 
 #endif