projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-20180629' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
lib
/
scatterlist.c
diff --git
a/lib/scatterlist.c
b/lib/scatterlist.c
index
1642fd5
..
7c6096a
100644
(file)
--- a/
lib/scatterlist.c
+++ b/
lib/scatterlist.c
@@
-24,9
+24,6
@@
**/
struct scatterlist *sg_next(struct scatterlist *sg)
{
**/
struct scatterlist *sg_next(struct scatterlist *sg)
{
-#ifdef CONFIG_DEBUG_SG
- BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
if (sg_is_last(sg))
return NULL;
if (sg_is_last(sg))
return NULL;
@@
-111,10
+108,7
@@
struct scatterlist *sg_last(struct scatterlist *sgl, unsigned int nents)
for_each_sg(sgl, sg, nents, i)
ret = sg;
for_each_sg(sgl, sg, nents, i)
ret = sg;
-#ifdef CONFIG_DEBUG_SG
- BUG_ON(sgl[0].sg_magic != SG_MAGIC);
BUG_ON(!sg_is_last(ret));
BUG_ON(!sg_is_last(ret));
-#endif
return ret;
}
EXPORT_SYMBOL(sg_last);
return ret;
}
EXPORT_SYMBOL(sg_last);