Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c07a308 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

sparc: use for_each_sg() 



This replaces the plain loop over the sglist array with for_each_sg()
macro which consists of sg_next() function calls.  Since sparc does select
ARCH_HAS_SG_CHAIN, it is necessary to use for_each_sg() in order to loop
over each sg element.  This also help find problems with drivers that do
not properly initialize their sg tables when CONFIG_DEBUG_SG is enabled.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 210bff6d

arch/sparc/kernel/ldc.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -2086,6 +2086,7 @@ int ldc_map_sg(struct ldc_channel *lp, 
	struct cookie_state state;

	struct cookie_state state;

	struct ldc_iommu *iommu;

	struct ldc_iommu *iommu;

	int err;

	int err;

	struct scatterlist *s;





	if (map_perm & ~LDC_MAP_ALL)

	if (map_perm & ~LDC_MAP_ALL)

		return -EINVAL;

		return -EINVAL;
@@ -2112,9 +2113,10 @@ int ldc_map_sg(struct ldc_channel *lp, 
	state.pte_idx = (base - iommu->page_table);

	state.pte_idx = (base - iommu->page_table);

	state.nc = 0;

	state.nc = 0;





	for (i = 0; i < num_sg; i++)

	for_each_sg(sg, s, num_sg, i) {

		fill_cookies(&state, page_to_pfn(sg_page(&sg[i])) << PAGE_SHIFT,

		fill_cookies(&state, page_to_pfn(sg_page(s)) << PAGE_SHIFT,

			     sg[i].offset, sg[i].length);

			     s->offset, s->length);

	}





	return state.nc;

	return state.nc;

}

}