Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

795e74f7

Commit 795e74f7 authored 14 years ago by Joerg Roedel

Downloads
- Plain Diff

Merge branch 'iommu/largepages' into amd-iommu/2.6.35

Conflicts:
	arch/x86/kernel/amd_iommu.c

parents a5235725 12c7389a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/include/asm/amd_iommu_types.h 34 additions, 0 deletions

arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c 126 additions, 71 deletions

arch/x86/kernel/amd_iommu.c
drivers/base/iommu.c 29 additions, 14 deletions

drivers/base/iommu.c
drivers/pci/intel-iommu.c 12 additions, 10 deletions

drivers/pci/intel-iommu.c
include/linux/iommu.h 12 additions, 12 deletions

include/linux/iommu.h
virt/kvm/iommu.c 91 additions, 22 deletions

virt/kvm/iommu.c

with 304 additions and 129 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment