This patch fixes a number of endianness warnings in the mips/octeon
code.

Signed-off-by: Herbert Xu <herb...@gondor.apana.org.au>

diff --git a/arch/mips/cavium-octeon/crypto/octeon-crypto.h 
b/arch/mips/cavium-octeon/crypto/octeon-crypto.h
index 7315cc307397..cb68f9e284bb 100644
--- a/arch/mips/cavium-octeon/crypto/octeon-crypto.h
+++ b/arch/mips/cavium-octeon/crypto/octeon-crypto.h
@@ -41,7 +41,7 @@ do {                                                  \
  */
 #define read_octeon_64bit_hash_dword(index)            \
 ({                                                     \
-       u64 __value;                                    \
+       __be64 __value;                                 \
                                                        \
        __asm__ __volatile__ (                          \
        "dmfc2 %[rt],0x0048+" STR(index)                \
diff --git a/arch/mips/cavium-octeon/crypto/octeon-md5.c 
b/arch/mips/cavium-octeon/crypto/octeon-md5.c
index 8c8ea139653e..5ee4ade99b99 100644
--- a/arch/mips/cavium-octeon/crypto/octeon-md5.c
+++ b/arch/mips/cavium-octeon/crypto/octeon-md5.c
@@ -68,10 +68,11 @@ static int octeon_md5_init(struct shash_desc *desc)
 {
        struct md5_state *mctx = shash_desc_ctx(desc);
 
-       mctx->hash[0] = cpu_to_le32(MD5_H0);
-       mctx->hash[1] = cpu_to_le32(MD5_H1);
-       mctx->hash[2] = cpu_to_le32(MD5_H2);
-       mctx->hash[3] = cpu_to_le32(MD5_H3);
+       mctx->hash[0] = MD5_H0;
+       mctx->hash[1] = MD5_H1;
+       mctx->hash[2] = MD5_H2;
+       mctx->hash[3] = MD5_H3;
+       cpu_to_le32_array(mctx->hash, 4);
        mctx->byte_count = 0;
 
        return 0;
@@ -139,8 +140,9 @@ static int octeon_md5_final(struct shash_desc *desc, u8 
*out)
        }
 
        memset(p, 0, padding);
-       mctx->block[14] = cpu_to_le32(mctx->byte_count << 3);
-       mctx->block[15] = cpu_to_le32(mctx->byte_count >> 29);
+       mctx->block[14] = mctx->byte_count << 3;
+       mctx->block[15] = mctx->byte_count >> 29;
+       cpu_to_le32_array(mctx->block + 14, 2);
        octeon_md5_transform(mctx->block);
 
        octeon_md5_read_hash(mctx);
-- 
Email: Herbert Xu <herb...@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Reply via email to