projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
scatterwalk.h
diff --git
a/crypto/scatterwalk.h
b/crypto/scatterwalk.h
index ace595a2e1191cfaceac5562068b411aa66512c1..87ed681cceba4fa42d9d46399560d6972aadbce2 100644
(file)
--- a/
crypto/scatterwalk.h
+++ b/
crypto/scatterwalk.h
@@
-20,17
+20,15
@@
#include "internal.h"
#include "internal.h"
-/* Define sg_next is an inline routine now in case we want to change
- scatterlist to a linked list later. */
-static inline struct scatterlist *sg_next(struct scatterlist *sg)
+static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg)
{
{
- return
sg + 1
;
+ return
(++sg)->length ? sg : (void *) sg_page(sg)
;
}
static inline unsigned long scatterwalk_samebuf(struct scatter_walk *walk_in,
struct scatter_walk *walk_out)
{
}
static inline unsigned long scatterwalk_samebuf(struct scatter_walk *walk_in,
struct scatter_walk *walk_out)
{
- return !(((
walk_in->sg->page - walk_out->sg->page
) << PAGE_SHIFT) +
+ return !(((
sg_page(walk_in->sg) - sg_page(walk_out->sg)
) << PAGE_SHIFT) +
(int)(walk_in->offset - walk_out->offset));
}
(int)(walk_in->offset - walk_out->offset));
}
@@
-62,7
+60,7
@@
static inline unsigned int scatterwalk_aligned(struct scatter_walk *walk,
static inline struct page *scatterwalk_page(struct scatter_walk *walk)
{
static inline struct page *scatterwalk_page(struct scatter_walk *walk)
{
- return
walk->sg->page
+ (walk->offset >> PAGE_SHIFT);
+ return
sg_page(walk->sg)
+ (walk->offset >> PAGE_SHIFT);
}
static inline void scatterwalk_unmap(void *vaddr, int out)
}
static inline void scatterwalk_unmap(void *vaddr, int out)
@@
-76,4
+74,7
@@
void scatterwalk_copychunks(void *buf, struct scatter_walk *walk,
void *scatterwalk_map(struct scatter_walk *walk, int out);
void scatterwalk_done(struct scatter_walk *walk, int out, int more);
void *scatterwalk_map(struct scatter_walk *walk, int out);
void scatterwalk_done(struct scatter_walk *walk, int out, int more);
+void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
+ unsigned int start, unsigned int nbytes, int out);
+
#endif /* _CRYPTO_SCATTERWALK_H */
#endif /* _CRYPTO_SCATTERWALK_H */