diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-05 20:16:11 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-23 19:24:40 +0200 |
commit | ad7c735e91646d0eba6959facdbfe5ab20fb7eb7 (patch) | |
tree | 538b365c81d2f231857319f0069238ce6cad256f /backport/compat/compat-3.9.c | |
parent | ae9244e71c86e2b1fd036f34e7cba12fdfbe4aa7 (diff) |
backports: remove scatterlist
This was only needed for some of the DRM drivers, remove it.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport/compat/compat-3.9.c')
-rw-r--r-- | backport/compat/compat-3.9.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/backport/compat/compat-3.9.c b/backport/compat/compat-3.9.c index d85a79fb..df10d7d6 100644 --- a/backport/compat/compat-3.9.c +++ b/backport/compat/compat-3.9.c @@ -9,7 +9,6 @@ */ #include <linux/module.h> -#include <linux/scatterlist.h> #include <linux/device.h> #include <linux/err.h> #include <linux/netdevice.h> @@ -17,46 +16,6 @@ #include <linux/if_ether.h> #include <linux/etherdevice.h> -#ifdef __sg_page_iter_next - -void __sg_page_iter_start(struct sg_page_iter *piter, - struct scatterlist *sglist, unsigned int nents, - unsigned long pgoffset) -{ - piter->__pg_advance = 0; - piter->__nents = nents; - - piter->page = NULL; - piter->sg = sglist; - piter->sg_pgoffset = pgoffset; -} -EXPORT_SYMBOL_GPL(__sg_page_iter_start); - -static int sg_page_count(struct scatterlist *sg) -{ - return PAGE_ALIGN(sg->offset + sg->length) >> PAGE_SHIFT; -} - -bool __sg_page_iter_next(struct sg_page_iter *piter) -{ - if (!piter->__nents || !piter->sg) - return false; - - piter->sg_pgoffset += piter->__pg_advance; - piter->__pg_advance = 1; - - while (piter->sg_pgoffset >= sg_page_count(piter->sg)) { - piter->sg_pgoffset -= sg_page_count(piter->sg); - piter->sg = sg_next(piter->sg); - if (!--piter->__nents || !piter->sg) - return false; - } - piter->page = nth_page(sg_page(piter->sg), piter->sg_pgoffset); - - return true; -} -EXPORT_SYMBOL_GPL(__sg_page_iter_next); - void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res) { void __iomem *dest_ptr; @@ -97,5 +56,3 @@ void eth_commit_mac_addr_change(struct net_device *dev, void *p) memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); } EXPORT_SYMBOL_GPL(eth_commit_mac_addr_change); - -#endif /* __sg_page_iter_next */ |