[Xen-changelog] [xen-unstable] linux: avoid need to modify include/linux/pfn.h

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1171547344 0
# Node ID 24f16bae44b0e80e43c0f8fd3d3f3088fb4ab74a
# Parent  449fb89590e7a31526fd153e2bf1afe422af6b96
linux: avoid need to modify include/linux/pfn.h
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 linux-2.6-xen-sparse/include/linux/pfn.h        |    9 ---------
 linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c |    2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff -r 449fb89590e7 -r 24f16bae44b0 
linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c
--- a/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c   Thu Feb 15 13:40:33 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c   Thu Feb 15 13:49:04 
2007 +0000
@@ -67,7 +67,7 @@ char * __init machine_specific_memory_se
        if ( rc == -ENOSYS ) {
                memmap.nr_entries = 1;
                map[0].addr = 0ULL;
-               map[0].size = PFN_PHYS(xen_start_info->nr_pages);
+               map[0].size = PFN_PHYS((unsigned long 
long)xen_start_info->nr_pages);
                /* 8MB slack (to balance backend allocations). */
                map[0].size += 8ULL << 20;
                map[0].type = E820_RAM;
diff -r 449fb89590e7 -r 24f16bae44b0 linux-2.6-xen-sparse/include/linux/pfn.h
--- a/linux-2.6-xen-sparse/include/linux/pfn.h  Thu Feb 15 13:40:33 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#ifndef _LINUX_PFN_H_
-#define _LINUX_PFN_H_
-
-#define PFN_ALIGN(x)   (((unsigned long 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)    ((unsigned long long)(x) << PAGE_SHIFT)
-
-#endif

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog