diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 23:19:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-21 23:19:38 -0400 |
| commit | 865d872280c848dc78b060088171724c3fb98bbb (patch) | |
| tree | 17590f7da0f0dab34ac21b6e1cd1e7dcf26ed6ba /arch/arm | |
| parent | f0d8690ad443069b26df43a1be09c0f14a928eb9 (diff) | |
| parent | 77bb3dfdc0d554befad58fdefbc41be5bc3ed38a (diff) | |
Merge tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull two xen bugfixes from David Vrabel:
- fix ARM build regression.
- fix VIRQ_CONSOLE related oops.
* tag 'for-linus-4.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/events: don't bind non-percpu VIRQs with percpu chip
xen/arm: Define xen_arch_suspend()
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/xen/enlighten.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 224081ccc92f..7d0f07020c80 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c | |||
| @@ -272,6 +272,7 @@ void xen_arch_pre_suspend(void) { } | |||
| 272 | void xen_arch_post_suspend(int suspend_cancelled) { } | 272 | void xen_arch_post_suspend(int suspend_cancelled) { } |
| 273 | void xen_timer_resume(void) { } | 273 | void xen_timer_resume(void) { } |
| 274 | void xen_arch_resume(void) { } | 274 | void xen_arch_resume(void) { } |
| 275 | void xen_arch_suspend(void) { } | ||
| 275 | 276 | ||
| 276 | 277 | ||
| 277 | /* In the hypervisor.S file. */ | 278 | /* In the hypervisor.S file. */ |