diff options
| -rw-r--r-- | include/linux/scatterlist.h | 4 | ||||
| -rw-r--r-- | lib/scatterlist.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 50a8486c524b..505d0481df1e 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h | |||
| @@ -266,12 +266,12 @@ int sg_alloc_table_from_pages(struct sg_table *sgt, | |||
| 266 | gfp_t gfp_mask); | 266 | gfp_t gfp_mask); |
| 267 | 267 | ||
| 268 | size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents, | 268 | size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents, |
| 269 | void *buf, size_t buflen); | 269 | const void *buf, size_t buflen); |
| 270 | size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents, | 270 | size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents, |
| 271 | void *buf, size_t buflen); | 271 | void *buf, size_t buflen); |
| 272 | 272 | ||
| 273 | size_t sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents, | 273 | size_t sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents, |
| 274 | void *buf, size_t buflen, off_t skip); | 274 | const void *buf, size_t buflen, off_t skip); |
| 275 | size_t sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents, | 275 | size_t sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents, |
| 276 | void *buf, size_t buflen, off_t skip); | 276 | void *buf, size_t buflen, off_t skip); |
| 277 | 277 | ||
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index 965c36e7a5a4..317b62c6da3c 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c | |||
| @@ -701,9 +701,9 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, | |||
| 701 | * | 701 | * |
| 702 | **/ | 702 | **/ |
| 703 | size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents, | 703 | size_t sg_copy_from_buffer(struct scatterlist *sgl, unsigned int nents, |
| 704 | void *buf, size_t buflen) | 704 | const void *buf, size_t buflen) |
| 705 | { | 705 | { |
| 706 | return sg_copy_buffer(sgl, nents, buf, buflen, 0, false); | 706 | return sg_copy_buffer(sgl, nents, (void *)buf, buflen, 0, false); |
| 707 | } | 707 | } |
| 708 | EXPORT_SYMBOL(sg_copy_from_buffer); | 708 | EXPORT_SYMBOL(sg_copy_from_buffer); |
| 709 | 709 | ||
| @@ -736,9 +736,9 @@ EXPORT_SYMBOL(sg_copy_to_buffer); | |||
| 736 | * | 736 | * |
| 737 | **/ | 737 | **/ |
| 738 | size_t sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents, | 738 | size_t sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents, |
| 739 | void *buf, size_t buflen, off_t skip) | 739 | const void *buf, size_t buflen, off_t skip) |
| 740 | { | 740 | { |
| 741 | return sg_copy_buffer(sgl, nents, buf, buflen, skip, false); | 741 | return sg_copy_buffer(sgl, nents, (void *)buf, buflen, skip, false); |
| 742 | } | 742 | } |
| 743 | EXPORT_SYMBOL(sg_pcopy_from_buffer); | 743 | EXPORT_SYMBOL(sg_pcopy_from_buffer); |
| 744 | 744 | ||
