diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 19:44:40 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 19:44:40 +0400 |
| commit | e64de3b96c1ba3c1de236a4a103ec21234a5849f (patch) | |
| tree | b4ed91858a3d353bd72e3be101433ac821759379 /include/xen/grant_table.h | |
| parent | dbfd5ccc057fbefb7247614741efbf96be0258c5 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | linux-e64de3b96c1ba3c1de236a4a103ec21234a5849f.tar.xz | |
Merge 3.7-rc3 into char-misc-next
This brings in the various 3.7-rc3 char fixes into char-misc-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/xen/grant_table.h')
| -rw-r--r-- | include/xen/grant_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index aecee9d112cb..694dcaf266e6 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h @@ -170,7 +170,7 @@ gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr, unmap->dev_bus_addr = 0; } -int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes, +int arch_gnttab_map_shared(xen_pfn_t *frames, unsigned long nr_gframes, unsigned long max_nr_gframes, void **__shared); int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes, |