diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 09:40:44 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 09:40:44 -0600 |
| commit | 4dacb91c7d1ab30aa9aac0d55216fc177d454254 (patch) | |
| tree | 51ccb90ca716b2b5e03c53a4598c20573ecdd3dc /arch/arm | |
| parent | ba368991f63f020afe4ee9d5b647c5397cf3c7f2 (diff) | |
| parent | 7d951f3ccb0308c95bf76d5eef9886dea35a7013 (diff) | |
| download | linux-4dacb91c7d1ab30aa9aac0d55216fc177d454254.tar.bz2 | |
Merge tag 'stable/for-linus-3.17-b-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen bugfixes from David Vrabel:
- fix ARM build
- fix boot crash with PVH guests
- improve reliability of resume/migration
* tag 'stable/for-linus-3.17-b-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen: use vmap() to map grant table pages in PVH guests
x86/xen: resume timer irqs early
arm/xen: remove duplicate arch_gnttab_init() function
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/xen/grant-table.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c index 2c4041c9bac5..e43791829ace 100644 --- a/arch/arm/xen/grant-table.c +++ b/arch/arm/xen/grant-table.c @@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared) { return 0; } - -int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status) -{ - return 0; -} |