From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Scott Parish" Subject: Re: [PATCH] alloc_{start,end} truncation Date: Mon, 8 Aug 2005 14:44:50 +0000 Message-ID: <20050808144450.GC12423@us.ibm.com> References: <20050805175257.GB12423@us.ibm.com> <87u0i0lh99.fsf@bytesex.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="tjCHc7DPkfUGtrlw" Return-path: Content-Disposition: inline In-Reply-To: <87u0i0lh99.fsf@bytesex.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Gerd Knorr Cc: xen-devel@lists.xensource.com, Scott Parish List-Id: xen-devel@lists.xenproject.org --tjCHc7DPkfUGtrlw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Aug 08, 2005 at 02:56:02PM +0200, Gerd Knorr wrote: > "Scott Parish" writes: > > But I think even better is to simply drop the ifdef and turn that into > > "#define page_to_phys(page) ((physaddr_t)(page - frame_table) << PAGE_SHIFT)" Excellent idea sRp -- Scott Parish Signed-off-by: srparish@us.ibm.com --tjCHc7DPkfUGtrlw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="dom0-physaddr-2.diff" diff -rN -u -p old-xen-pae/xen/arch/x86/domain_build.c new-xen-pae/xen/arch/x86/domain_build.c --- old-xen-pae/xen/arch/x86/domain_build.c 2005-08-01 21:06:42.000000000 +0000 +++ new-xen-pae/xen/arch/x86/domain_build.c 2005-08-05 17:48:07.000000000 +0000 @@ -78,8 +78,8 @@ int construct_dom0(struct domain *d, unsigned long pfn, mfn; unsigned long nr_pages; unsigned long nr_pt_pages; - unsigned long alloc_start; - unsigned long alloc_end; + physaddr_t alloc_start; + physaddr_t alloc_end; unsigned long count; struct pfn_info *page = NULL; start_info_t *si; @@ -219,8 +219,8 @@ int construct_dom0(struct domain *d, panic("Insufficient contiguous RAM to build kernel image.\n"); printk("PHYSICAL MEMORY ARRANGEMENT:\n" - " Dom0 alloc.: %p->%p", - _p(alloc_start), _p(alloc_end)); + " Dom0 alloc.: %llx->%llx", + (u64)alloc_start, (u64)alloc_end); if ( d->tot_pages < nr_pages ) printk(" (%lu pages to be allocated)", nr_pages - d->tot_pages); diff -rN -u -p old-xen-pae/xen/include/asm-x86/io.h new-xen-pae/xen/include/asm-x86/io.h --- old-xen-pae/xen/include/asm-x86/io.h 2005-07-19 18:51:39.000000000 +0000 +++ new-xen-pae/xen/include/asm-x86/io.h 2005-08-08 14:34:40.000000000 +0000 @@ -45,12 +45,7 @@ static inline void * phys_to_virt(unsign /* * Change "struct pfn_info" to physical address. */ -#ifdef CONFIG_HIGHMEM64G -#define page_to_phys(page) ((u64)(page - frame_table) << PAGE_SHIFT) -#else -#define page_to_phys(page) ((page - frame_table) << PAGE_SHIFT) -#endif - +#define page_to_phys(page) ((physaddr_t)(page - frame_table) << PAGE_SHIFT) #define page_to_pfn(_page) ((unsigned long)((_page) - frame_table)) #define page_to_virt(_page) phys_to_virt(page_to_phys(_page)) --tjCHc7DPkfUGtrlw Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --tjCHc7DPkfUGtrlw--