ia64/xen-unstable

changeset 13975:24f16bae44b0

linux: avoid need to modify include/linux/pfn.h
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Thu Feb 15 13:49:04 2007 +0000 (2007-02-15)
parents 449fb89590e7
children e253a63651bf
files linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c linux-2.6-xen-sparse/include/linux/pfn.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c	Thu Feb 15 13:40:33 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c	Thu Feb 15 13:49:04 2007 +0000
     1.3 @@ -67,7 +67,7 @@ char * __init machine_specific_memory_se
     1.4  	if ( rc == -ENOSYS ) {
     1.5  		memmap.nr_entries = 1;
     1.6  		map[0].addr = 0ULL;
     1.7 -		map[0].size = PFN_PHYS(xen_start_info->nr_pages);
     1.8 +		map[0].size = PFN_PHYS((unsigned long long)xen_start_info->nr_pages);
     1.9  		/* 8MB slack (to balance backend allocations). */
    1.10  		map[0].size += 8ULL << 20;
    1.11  		map[0].type = E820_RAM;
     2.1 --- a/linux-2.6-xen-sparse/include/linux/pfn.h	Thu Feb 15 13:40:33 2007 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,9 +0,0 @@
     2.4 -#ifndef _LINUX_PFN_H_
     2.5 -#define _LINUX_PFN_H_
     2.6 -
     2.7 -#define PFN_ALIGN(x)	(((unsigned long long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
     2.8 -#define PFN_UP(x)	(((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
     2.9 -#define PFN_DOWN(x)	((x) >> PAGE_SHIFT)
    2.10 -#define PFN_PHYS(x)	((unsigned long long)(x) << PAGE_SHIFT)
    2.11 -
    2.12 -#endif