From c88e9e27bb4ca2e037c358dc21157f3962fbf9be Mon Sep 17 00:00:00 2001 From: Annie Li Date: Tue, 22 Nov 2011 09:59:56 +0800 Subject: [PATCH] --- yaml --- r: 282078 b: refs/heads/master c: c123799a41bf466ce5b199331aac4c1f28f67ec3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/xen/grant-table.c | 7 +++---- trunk/include/xen/grant_table.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e8416e811767..8d53b2b30ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85ff6acb075a484780b3d763fdf41596d8fc0970 +refs/heads/master: c123799a41bf466ce5b199331aac4c1f28f67ec3 diff --git a/trunk/drivers/xen/grant-table.c b/trunk/drivers/xen/grant-table.c index 301869f60dc7..bd325fd0000b 100644 --- a/trunk/drivers/xen/grant-table.c +++ b/trunk/drivers/xen/grant-table.c @@ -50,7 +50,6 @@ #include #include - /* External tools reserve first few grant table entries. */ #define NR_RESERVED_ENTRIES 8 #define GNTTAB_LIST_END 0xffffffff @@ -598,8 +597,8 @@ unsigned int gnttab_max_grant_frames(void) EXPORT_SYMBOL_GPL(gnttab_max_grant_frames); int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, - struct gnttab_map_grant_ref *kmap_ops, - struct page **pages, unsigned int count) + struct gnttab_map_grant_ref *kmap_ops, + struct page **pages, unsigned int count) { int i, ret; pte_t *pte; @@ -649,7 +648,7 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, EXPORT_SYMBOL_GPL(gnttab_map_refs); int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, - struct page **pages, unsigned int count) + struct page **pages, unsigned int count) { int i, ret; diff --git a/trunk/include/xen/grant_table.h b/trunk/include/xen/grant_table.h index 5494c402c83a..fea4954174f0 100644 --- a/trunk/include/xen/grant_table.h +++ b/trunk/include/xen/grant_table.h @@ -157,7 +157,7 @@ unsigned int gnttab_max_grant_frames(void); #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr)) int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, - struct gnttab_map_grant_ref *kmap_ops, + struct gnttab_map_grant_ref *kmap_ops, struct page **pages, unsigned int count); int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, struct page **pages, unsigned int count);