[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] Merge.
# HG changeset patch # User sos22@xxxxxxxxxxxxxxxxxxxx # Node ID 47d49e8b8042c15ed1409786701a16fcda02e91c # Parent fd59d2620ac131ae09c06a561dd179045accae82 # Parent 87dec3b9c54609eb913b9776020bf040ecec476c Merge. Signed-off-by: Steven Smith, sos22@xxxxxxxxx diff -r fd59d2620ac1 -r 47d49e8b8042 linux-2.6-xen-sparse/drivers/xen/blkback/interface.c --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c Fri Aug 19 15:37:37 2005 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c Fri Aug 19 15:47:19 2005 @@ -199,8 +199,10 @@ if (blkif->evtchn) unbind_evtchn_from_irqhandler(blkif->evtchn, blkif); - if (blkif->blk_ring.sring) - vfree(blkif->blk_ring.sring); + if (blkif->blk_ring.sring) { + unmap_frontend_page(blkif); + vfree(blkif->blk_ring.sring); + } pblkif = &blkif_hash[BLKIF_HASH(blkif->domid)]; while ( *pblkif != blkif ) diff -r fd59d2620ac1 -r 47d49e8b8042 linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h Fri Aug 19 15:37:37 2005 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h Fri Aug 19 15:47:19 2005 @@ -514,7 +514,7 @@ : "0" (__HYPERVISOR_sched_op), "1" (SCHEDOP_vcpu_pickle | (vcpu << SCHEDOP_vcpushift)), "2" (ctxt) - : "memory" ); + : __syscall_clobber ); return ret; } _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |