Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Browse source

Pull sparc fixes from David Miller
 "Unfortunately, I brown paper bagged the generic iommu pool allocator
  by applying the wrong revision of the patch series.

  This reverts the bad one, and puts the right one in"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.

...

This commit is contained in:

Linus Torvalds 2015-04-18 18:01:29 -04:00

parent dba94f2155 ccb301862a

commit 64fb1d0e97

6 changed files with 202 additions and 230 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/sparc/include/asm/iommu_64.h

View file

78

arch/sparc/kernel/iommu.c

View file

60

arch/sparc/kernel/ldc.c

View file

64

arch/sparc/kernel/pci_sun4v.c

View file

38

include/linux/iommu-common.h

View file

190

lib/iommu-common.c

View file