git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
s390
/
crypto
/
sha1_s390.c
diff --git
a/arch/s390/crypto/sha1_s390.c
b/arch/s390/crypto/sha1_s390.c
index
2c5ec79
..
f6de782
100644
(file)
--- a/
arch/s390/crypto/sha1_s390.c
+++ b/
arch/s390/crypto/sha1_s390.c
@@
-57,10
+57,10
@@
static int sha1_export(struct shash_desc *desc, void *out)
return 0;
}
return 0;
}
-static int sha1_import(struct shash_desc *desc, const
u8
*in)
+static int sha1_import(struct shash_desc *desc, const
void
*in)
{
{
- struct s
ha1_state
*sctx = shash_desc_ctx(desc);
- struct sha1_state *ictx = in;
+ struct s
390_sha_ctx
*sctx = shash_desc_ctx(desc);
+
const
struct sha1_state *ictx = in;
sctx->count = ictx->count;
memcpy(sctx->state, ictx->state, sizeof(ictx->state));
sctx->count = ictx->count;
memcpy(sctx->state, ictx->state, sizeof(ictx->state));