Revert "scatterlist: use sg_phys()"
authorDan Williams <dan.j.williams@intel.com>
Tue, 15 Dec 2015 20:54:06 +0000 (12:54 -0800)
committerDan Williams <dan.j.williams@intel.com>
Tue, 15 Dec 2015 20:54:06 +0000 (12:54 -0800)
commit3e6110fd5480f5f86ff31381f4dea14218284bff
tree03d9317932cede8ff2fe902b254244900813f372
parentd91e892825ae6f0ed4f8b07ae5d348eff86ab2ea
Revert "scatterlist: use sg_phys()"

commit db0fa0cb0157 "scatterlist: use sg_phys()" did replacements of
the form:

    phys_addr_t phys = page_to_phys(sg_page(s));
    phys_addr_t phys = sg_phys(s) & PAGE_MASK;

However, this breaks platforms where sizeof(phys_addr_t) >
sizeof(unsigned long).  Revert for 4.3 and 4.4 to make room for a
combined helper in 4.5.

Cc: <stable@vger.kernel.org>
Cc: Jens Axboe <axboe@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Fixes: db0fa0cb0157 ("scatterlist: use sg_phys()")
Suggested-by: Joerg Roedel <joro@8bytes.org>
Reported-by: Vitaly Lavrov <vel21ripn@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
arch/arm/mm/dma-mapping.c
arch/microblaze/kernel/dma.c
drivers/iommu/intel-iommu.c
drivers/iommu/iommu.c
drivers/staging/android/ion/ion_chunk_heap.c