Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next

[sfrench/cifs-2.6.git] / arch / arm / xen / grant-table.c

diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c
index 859a9bb002d54875e5089a940442d5015a9fe1a4..91cf08ba1e957d251fcb5b0028705a4cd52a7fd8 100644 (file)
--- a/arch/arm/xen/grant-table.c
+++ b/arch/arm/xen/grant-table.c
@@ -51,3 +51,8 @@ int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,
 {
        return -ENOSYS;
 }
+
+int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)
+{
+       return 0;
+}