Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/include/linux/pfn.h b/include/linux/pfn.h
index ba2a866..d2aace0 100644 (file)
--- a/include/linux/pfn.h
+++ b/include/linux/pfn.h
@@ -4,6 +4,10 @@
 #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)
+#if defined(CONFIG_X86_XEN) && defined(CONFIG_X86_PAE)
 #define PFN_PHYS(x)    ((unsigned long long)(x) << PAGE_SHIFT)
+#else
+#define PFN_PHYS(x)    ((x) << PAGE_SHIFT)
+#endif
 
 #endif