diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-20 09:34:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-20 09:34:54 -0800 |
| commit | 4203d0eb3acc459d1e7737193b5684e71185dca7 (patch) | |
| tree | 357734dc414c22e87cd676dd1ff3feead64defc9 /sound/sound_core.c | |
| parent | 5263f0a88076ab32b3120356645734918bdc1700 (diff) | |
| parent | c1d15f5c8bc1170dafe16e988e55437245966dfe (diff) | |
Merge tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen bugfixes from Konrad Rzeszutek Wilk:
- Fix balloon driver for auto-translate guests (PVHVM, ARM) to not use
scratch pages.
- Fix block API header for ARM32 and ARM64 to have proper layout
- On ARM when mapping guests, stick on PTE_SPECIAL
- When using SWIOTLB under ARM, don't call swiotlb functions twice
- When unmapping guests memory and if we fail, don't return pages which
failed to be unmapped.
- Grant driver was using the wrong address on ARM.
* tag 'stable/for-linus-3.13-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/balloon: Seperate the auto-translate logic properly (v2)
xen/block: Correctly define structures in public headers on ARM32 and ARM64
arm: xen: foreign mapping PTEs are special.
xen/arm64: do not call the swiotlb functions twice
xen: privcmd: do not return pages which we have failed to unmap
XEN: Grant table address, xen_hvm_resume_frames, is a phys_addr not a pfn
Diffstat (limited to 'sound/sound_core.c')
0 files changed, 0 insertions, 0 deletions