RE: [Xen-ia64-devel] Build fixes for blkback on ia64

["Tian, Kevin" <kevin.tian@xxxxxxxxx>]

Hi, Horms,
        Welcome. Seems Dan just sent out a similar patch as yours earlier today 
to xen-devel, as:
http://lists.xensource.com/archives/html/xen-devel/2005-12/msg00325.html 

        You may take a look and see any incremental patch still required in 
your side and repost to the list. ;-)

Thanks,
Kevin

>-----Original Message-----
>From: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx
>[mailto:xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx] On Behalf Of Horms
>Sent: 2005年12月9日 13:52
>To: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
>Subject: [Xen-ia64-devel] Build fixes for blkback on ia64
>
>Build fixes for blkback on ia64
>
>After 8308:6f62ad959f6b, blkback does not seem to compile on ia64
>I'm not sure if the patch below is correct, especially the first
>fragment, but here is what it does:
>
>* Call vaddr_pagenr() with valid agruments
>
>The rest of the changes are trivial
>
>* Removes duplicate = in assignment of pending_vaddrs[]
>
>* Remove unused variable struct page *page
>
>* Declare lock_vm_area() and unlock_vm_area() in
>  include/asm-xen/driver_util.h
>
>Signed-Off-By: Horms <horms@xxxxxxxxxxxx>
>
>--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
>+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
>@@ -412,8 +412,8 @@
>
>               pending_handle(pending_req, i) = map[i].handle;
> #ifdef __ia64__
>-              pending_vaddrs[vaddr_pagenr(req, seg)] =
>-                      = gnttab_map_vaddr(map[i]);
>+              pending_vaddrs[vaddr_pagenr(pending_req, i)] =
>+                      (unsigned long) gnttab_map_vaddr(map[i]);
> #else
>               set_phys_to_machine(__pa(vaddr(
>                       pending_req, i)) >> PAGE_SHIFT,
>@@ -526,7 +526,6 @@
>
> static int __init blkif_init(void)
> {
>-      struct page *page;
>       int i;
>
>       if (xen_init() < 0)
>@@ -547,8 +546,6 @@
>       blkif_interface_init();
>
> #ifdef __ia64__
>-      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 */
>--- a/linux-2.6-xen-sparse/include/asm-xen/driver_util.h
>+++ b/linux-2.6-xen-sparse/include/asm-xen/driver_util.h
>@@ -13,6 +13,9 @@
> extern void lock_vm_area(struct vm_struct *area);
> extern void unlock_vm_area(struct vm_struct *area);
>
>+int xen_init(void);
>+unsigned long alloc_empty_foreign_map_page_range(unsigned long pages);
>+
> #endif /* __ASM_XEN_DRIVER_UTIL_H__ */
>
> /*
>
>
>_______________________________________________
>Xen-ia64-devel mailing list
>Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
>http://lists.xensource.com/xen-ia64-devel

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