diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-07 02:16:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-07 02:16:42 +0200 |
| commit | bf71d0e18ea94adade8c6cd5bd40beb83bef1565 (patch) | |
| tree | 2f50d4b70aa47e9b27e60bf1d3a6081054aebd7f /arch/arm/mach-shmobile/setup-sh7372.c | |
| parent | Merge tag '3.6-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/he... (diff) | |
| parent | xen/pciback: Fix proper FLR steps. (diff) | |
| download | linux-bf71d0e18ea94adade8c6cd5bd40beb83bef1565.tar.xz linux-bf71d0e18ea94adade8c6cd5bd40beb83bef1565.zip | |
Merge tag 'stable/for-linus-3.6-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
* Fix for TLB flushing introduced in v3.6
* Fix Xen-SWIOTLB not using proper DMA mask - device had 64bit but
in a 32-bit kernel we need to allocate for coherent pages from a
32-bit pool.
* When trying to re-use P2M nodes we had a one-off error and triggered
a BUG_ON check with specific CONFIG_ option.
* When doing FLR in Xen-PCI-backend we would first do FLR then save the
PCI configuration space. We needed to do it the other way around.
* tag 'stable/for-linus-3.6-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/pciback: Fix proper FLR steps.
xen: Use correct masking in xen_swiotlb_alloc_coherent.
xen: fix logical error in tlb flushing
xen/p2m: Fix one-off error in checking the P2M tree directory.
Diffstat (limited to 'arch/arm/mach-shmobile/setup-sh7372.c')
0 files changed, 0 insertions, 0 deletions