tree af8e0845d9a21c568b34d34195858c1f462b53e6
parent 8aaa51b63cc3c5f3b2e72d2f0e193d9c2e00fe46
parent 0edfad5959df7379c9e554fbe8ba264ae232d321
author Linus Torvalds <torvalds@linux-foundation.org> 1429683694 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1429683694 -0700

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

Pull sparc fixes from David Miller:

 1) ldc_alloc_exp_dring() can be called from softints, so use
    GFP_ATOMIC.  From Sowmini Varadhan.

 2) Some minor warning/build fixups for the new iommu-common code on
    certain archs and with certain debug options enabled.  Also from
    Sowmini Varadhan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in softirq context
  sparc64: Use M7 PMC write on all chips T4 and onward.
  iommu-common: rename iommu_pool_hash to iommu_hash_common
  iommu-common: fix x86_64 compiler warnings