Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51d13fca authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

arch/arm64/crypto/sha2-ce-glue.c: fix 4.9.129 merge issue 



Seems the same lines got included twice.

Reported-by: default avatarChienwei Chang <chienwei.chang@mediatek.com>
Reported-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 961ef0a0

arch/arm64/crypto/sha2-ce-glue.c

+0 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ static inline void __cfi_sha2_ce_transform(struct sha256_state *sst, 
#define sha2_ce_transform __cfi_sha2_ce_transform

#endif



const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state,

					      sst.count);

const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state,

						 finalize);



const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state,

					      sst.count);

const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state,