summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-30 09:00:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-30 09:00:20 -0700
commitacba648dca67c6a224991a9e9f935b2bdec8dc17 (patch)
tree2c9a08e4ae279850ac8e47010401be5095fdb957 /include
parentd8772157ef7b5f4fe208f3e8da7b9c6800495698 (diff)
parentb7dd0e350e0bd4c0fddcc9b8958342700b00b168 (diff)
Merge tag 'stable/for-linus-3.16-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen fix from David Vrabel: "Fix BUG when trying to expand the grant table. This seems to occur often during boot with Ubuntu 14.04 PV guests" * tag 'stable/for-linus-3.16-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: safely map and unmap grant frames when in atomic context
Diffstat (limited to 'include')
-rw-r--r--include/xen/grant_table.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index a5af2a26d94..5c1aba154b6 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -170,6 +170,7 @@ gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr,
unmap->dev_bus_addr = 0;
}
+int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status);
int arch_gnttab_map_shared(xen_pfn_t *frames, unsigned long nr_gframes,
unsigned long max_nr_gframes,
void **__shared);