[Xen-changelog] [xen-unstable] merge with xen-unstable.hg

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 81d35c0d964f9d0066027ac06a25c636c5065233
# Parent  08378b83ea1e9df6e549544eaee3116b7fe8861b
# Parent  231e07e22f9cd09e310a0db65ed62acb12c51855
merge with xen-unstable.hg
---
 linux-2.6-xen-sparse/drivers/xen/core/gnttab.c |    1 +
 1 files changed, 1 insertion(+)

diff -r 08378b83ea1e -r 81d35c0d964f 
linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c    Fri Jun 16 09:06:40 
2006 -0600
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c    Fri Jun 16 09:10:08 
2006 -0600
@@ -348,6 +348,7 @@ void gnttab_cancel_free_callback(struct 
        }
        spin_unlock_irqrestore(&gnttab_list_lock, flags);
 }
+EXPORT_SYMBOL_GPL(gnttab_cancel_free_callback);
 
 #ifndef __ia64__
 static int map_pte_fn(pte_t *pte, struct page *pmd_page,

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