projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CRYPTO] scatterwalk: Restore custom sg chaining for now
[powerpc.git]
/
crypto
/
scatterwalk.c
diff --git
a/crypto/scatterwalk.c
b/crypto/scatterwalk.c
index
b9bbda0
..
297e19d
100644
(file)
--- a/
crypto/scatterwalk.c
+++ b/
crypto/scatterwalk.c
@@
-13,6
+13,8
@@
* any later version.
*
*/
* any later version.
*
*/
+
+#include <crypto/scatterwalk.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/module.h>
@@
-20,9
+22,6
@@
#include <linux/highmem.h>
#include <linux/scatterlist.h>
#include <linux/highmem.h>
#include <linux/scatterlist.h>
-#include "internal.h"
-#include "scatterwalk.h"
-
static inline void memcpy_dir(void *buf, void *sgdata, size_t nbytes, int out)
{
void *src = out ? buf : sgdata;
static inline void memcpy_dir(void *buf, void *sgdata, size_t nbytes, int out)
{
void *src = out ? buf : sgdata;
@@
-113,7
+112,7
@@
void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
break;
offset += sg->length;
break;
offset += sg->length;
- sg = sg_next(sg);
+ sg = s
catterwalk_s
g_next(sg);
}
scatterwalk_advance(&walk, start - offset);
}
scatterwalk_advance(&walk, start - offset);