Merge tag 'stable/for-linus-3.17-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[mirror_ubuntu-artful-kernel.git] / arch / arm / xen / grant-table.c

diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c
index e43791829aceb2a725d45b419b36c21b54ec0300..2c4041c9bac5e18e320d25b0577d034c52514b43 100644 (file)
--- a/arch/arm/xen/grant-table.c
+++ b/arch/arm/xen/grant-table.c
@@ -49,3 +49,8 @@ int arch_gnttab_init(unsigned long nr_shared)
 {
        return 0;
 }
+
+int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)
+{
+       return 0;
+}