Prev: linux-next: manual merge of the staging-next tree with the pcmcia tree
Next: cpuset,mm: fix no node to alloc memory when changing cpuset's mems
From: Ingo Molnar on 12 May 2010 02:20 * Joerg Roedel <joerg.roedel(a)amd.com> wrote: > Hi Ingo, > > The following changes since commit b57f95a38233a2e73b679bea4a5453a1cc2a1cc9: > > Linux 2.6.34-rc7 (2010-05-09 18:36:28 -0700) > > are available in the git repository at: > git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git amd-iommu/2.6.35 > > Joerg Roedel (12): > iommu-api: Rename ->{un}map function pointers to ->{un}map_range > iommu-api: Add iommu_map and iommu_unmap functions > iommu-api: Add ->{un}map callbacks to iommu_ops > VT-d: Change {un}map_range functions to implement {un}map interface > kvm: Change kvm_iommu_map_pages to map large pages > x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes > x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes > x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes > x86/amd-iommu: Implement ->{un}map callbacks for iommu-api > iommu-api: Remove iommu_{un}map_range functions > x86/amd-iommu: Add amd_iommu=off command line option > Merge branch 'iommu/largepages' into amd-iommu/2.6.35 > > Documentation/kernel-parameters.txt | 2 + > arch/x86/include/asm/amd_iommu_types.h | 34 ++++++ > arch/x86/kernel/amd_iommu.c | 197 ++++++++++++++++++++------------ > arch/x86/kernel/amd_iommu_init.c | 6 + > drivers/base/iommu.c | 43 +++++--- > drivers/pci/intel-iommu.c | 22 ++-- > include/linux/iommu.h | 24 ++-- > virt/kvm/iommu.c | 113 +++++++++++++++---- > 8 files changed, 312 insertions(+), 129 deletions(-) > > This pull request consists mostly of the patches for the IOMMU large > page support and the associated AMD IOMMU driver changes. The code also > touches KVM files. I asked Avi if it is ok if these changes go through > -tip and he is fine with that. Beside the largepage code it includes one > more patch which adds an amd_iommu=off command line parameter. Please > pull. Pulled, thanks Joerg! Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |