X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fpfn.h;h=d2aace0e222e41356d172f803f35732ceef7e5f4;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=ba2a86677eb65e6f998dd0dcadd00d4e49328cf6;hpb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;p=linux-2.6.git

diff --git a/include/linux/pfn.h b/include/linux/pfn.h
index ba2a86677..d2aace0e2 100644
--- 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