diff --git a/[refs] b/[refs] index 2e9cfa1bbac1..676872a1aae5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efcf8023e299be605f217dc2c1b2754b5534569c +refs/heads/master: 03fd9cee7f46dddcd2562bc175d2c348502ce281 diff --git a/trunk/include/linux/scatterlist.h b/trunk/include/linux/scatterlist.h index 66ff545552f7..4efbd9c445f5 100644 --- a/trunk/include/linux/scatterlist.h +++ b/trunk/include/linux/scatterlist.h @@ -5,7 +5,7 @@ #include #include -static inline void sg_set_buf(struct scatterlist *sg, void *buf, +static inline void sg_set_buf(struct scatterlist *sg, const void *buf, unsigned int buflen) { sg->page = virt_to_page(buf); @@ -13,7 +13,7 @@ static inline void sg_set_buf(struct scatterlist *sg, void *buf, sg->length = buflen; } -static inline void sg_init_one(struct scatterlist *sg, void *buf, +static inline void sg_init_one(struct scatterlist *sg, const void *buf, unsigned int buflen) { memset(sg, 0, sizeof(*sg));