public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Sachin Sant <sachinp@in•ibm.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-s390@vger•kernel.org,
	Heiko Carstens <heiko.carstens@de•ibm.com>,
	herbert@gondor•apana.org.au
Subject: Next July 16: s390 sha1 crypro build failure.
Date: Thu, 16 Jul 2009 15:29:26 +0530	[thread overview]
Message-ID: <4A5EF9FE.2050302@in.ibm.com> (raw)
In-Reply-To: <20090716172015.be5dc94b.sfr@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

Today's next tree fails to build on s390 with following errors.

arch/s390/crypto/sha1_s390.c:67: error: 'struct sha1_state' has no member named 'buf'
arch/s390/crypto/sha1_s390.c:68: error: 'struct sha1_state' has no member named 'func'

arch/s390/crypto/sha256_s390.c:64: error: 'struct sha256_state' has no member named 'func'

Probably because of commit 406f104b4172de7452702c6810807c1b0132ba22.

In sha1_/sha256_import() functions struct s390_sha_ctx *sctx should be
used instead of struct sha1_state.

The following patch fixed the issue for me.

Thanks
-Sachin



[-- Attachment #2: s390-crypto-build-break-fix.patch --]
[-- Type: text/x-patch, Size: 1209 bytes --]

Use struct s390_sha_ctx instead of sha1/sha256_state struct to fix
s390 crypto build break.

Signed-off-by : Sachin Sant <sachinp@in•ibm.com>
---

diff -Naurp linux//arch/s390/crypto/sha1_s390.c new//arch/s390/crypto/sha1_s390.c
--- linux//arch/s390/crypto/sha1_s390.c	2009-07-16 05:46:31.000000000 -0400
+++ new//arch/s390/crypto/sha1_s390.c	2009-07-16 05:48:10.000000000 -0400
@@ -59,7 +59,7 @@ static int sha1_export(struct shash_desc
 
 static int sha1_import(struct shash_desc *desc, const u8 *in)
 {
-	struct sha1_state *sctx = shash_desc_ctx(desc);
+	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
 	struct sha1_state *ictx = in;
 
 	sctx->count = ictx->count;
diff -Naurp linux//arch/s390/crypto/sha256_s390.c new//arch/s390/crypto/sha256_s390.c
--- linux//arch/s390/crypto/sha256_s390.c	2009-07-16 05:47:42.000000000 -0400
+++ new//arch/s390/crypto/sha256_s390.c	2009-07-16 05:46:07.000000000 -0400
@@ -55,7 +55,7 @@ static int sha256_export(struct shash_de
 
 static int sha256_import(struct shash_desc *desc, const u8 *in)
 {
-	struct sha256_state *sctx = shash_desc_ctx(desc);
+	struct s390_sha_ctx *sctx = shash_desc_ctx(desc);
 	struct sha256_state *ictx = in;
 
 	sctx->count = ictx->count;

  reply	other threads:[~2009-07-16  9:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-16  7:20 linux-next: Tree for July 16 Stephen Rothwell
2009-07-16  9:59 ` Sachin Sant [this message]
2009-07-16 11:58   ` Next July 16: s390 sha1 crypro build failure Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A5EF9FE.2050302@in.ibm.com \
    --to=sachinp@in$(echo .)ibm.com \
    --cc=heiko.carstens@de$(echo .)ibm.com \
    --cc=herbert@gondor$(echo .)apana.org.au \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux-s390@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox