From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH 6/8] 2.6.17: no need for include/linux/pfn.h Date: Wed, 14 Feb 2007 15:59:58 +0000 Message-ID: <45D3400E.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org One less common file needing changes (and hence presence in the sparse tree). Signed-off-by: Jan Beulich Index: head-2007-02-08/arch/i386/mach-xen/setup.c =================================================================== --- head-2007-02-08.orig/arch/i386/mach-xen/setup.c 2007-02-08 17:07:13.000000000 +0100 +++ head-2007-02-08/arch/i386/mach-xen/setup.c 2007-02-08 17:09:47.000000000 +0100 @@ -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; Index: head-2007-02-08/include/linux/pfn.h =================================================================== --- head-2007-02-08.orig/include/linux/pfn.h 2007-02-08 17:07:13.000000000 +0100 +++ /dev/null @@ -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