diff options
author | James Morris <james.l.morris@oracle.com> | 2014-09-30 10:44:04 -0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-09-30 10:44:04 -0400 |
commit | 6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1 (patch) | |
tree | 2ab49b7d19fb69cdae5b6be9e7ba44f6cf3d45ef /arch/arm/xen | |
parent | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (diff) | |
parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) |
Merge commit 'v3.16' into next
Diffstat (limited to 'arch/arm/xen')
-rw-r--r-- | arch/arm/xen/grant-table.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c index 859a9bb002d5..91cf08ba1e95 100644 --- 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, | |||
51 | { | 51 | { |
52 | return -ENOSYS; | 52 | return -ENOSYS; |
53 | } | 53 | } |
54 | |||
55 | int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status) | ||
56 | { | ||
57 | return 0; | ||
58 | } | ||