Aron Griffis
2006-Oct-06 13:16 UTC
[Xen-devel] linux-2.6-xen.hg missing bits from xen-unstable.hg cset 11032
Hi Christian, Trying to pull recent xen-unstable bits into linux-2.6-xen shows a conflict in blkback.c. The problem is that some bits were apparently lost when pulling xen-unstable.hg cset 11032. Here is the necessary patch. Signed-off-by: Aron Griffis <aron@hp.com> --- linux-2.6-xen.hg/drivers/xen/blkback/blkback.c 2006-09-11 12:27:11.000000000 -0400 +++ xen-unstable.hg/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c 2006-09-28 14:56:10.000000000 -0400 @@ -514,17 +514,10 @@ mmap_pages = blkif_reqs * BLKIF_MAX_SEGMENTS_PER_REQUEST; -#ifdef CONFIG_XEN_IA64_DOM0_NON_VP - extern unsigned long alloc_empty_foreign_map_page_range( - unsigned long pages); - mmap_vstart = (unsigned long) - alloc_empty_foreign_map_page_range(mmap_pages); -#else /* ! ia64 */ page = balloon_alloc_empty_page_range(mmap_pages); if (page == NULL) return -ENOMEM; mmap_vstart = (unsigned long)pfn_to_kaddr(page_to_pfn(page)); -#endif pending_reqs = kmalloc(sizeof(pending_reqs[0]) * blkif_reqs, GFP_KERNEL); _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel