Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

8 files changed, 42 insertions, 14 deletions

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 46e899ac924e..6c4c8b7ce3aa 100644
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -28,6 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/of_platform.h>
+#include <linux/slab.h>
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
 #include <asm/cacheflush.h>
@@ -1274,7 +1275,7 @@ static int __exit crypto4xx_remove(struct of_device *ofdev)
         return 0;
 }
 
-static struct of_device_id crypto4xx_match[] = {
+static const struct of_device_id crypto4xx_match[] = {
         { .compatible      = "amcc,ppc4xx-crypto",},
         { },
 };
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 4801162919d9..c7a5a43ba691 100644
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -135,13 +135,13 @@ static int geode_setkey_cip(struct crypto_tfm *tfm, const u8 *key,
         /*
          * The requested key size is not supported by HW, do a fallback
          */
-        op->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
-        op->fallback.blk->base.crt_flags |= (tfm->crt_flags & CRYPTO_TFM_REQ_MASK);
+        op->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
+        op->fallback.cip->base.crt_flags |= (tfm->crt_flags & CRYPTO_TFM_REQ_MASK);
 
         ret = crypto_cipher_setkey(op->fallback.cip, key, len);
         if (ret) {
                 tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
-                tfm->crt_flags |= (op->fallback.blk->base.crt_flags & CRYPTO_TFM_RES_MASK);
+                tfm->crt_flags |= (op->fallback.cip->base.crt_flags & CRYPTO_TFM_RES_MASK);
         }
         return ret;
 }
@@ -263,7 +263,7 @@ static int fallback_init_cip(struct crypto_tfm *tfm)
 
         if (IS_ERR(op->fallback.cip)) {
                 printk(KERN_ERR "Error allocating fallback algo %s\n", name);
-                return PTR_ERR(op->fallback.blk);
+                return PTR_ERR(op->fallback.cip);
         }
 
         return 0;
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 5f753fc08730..73e8b1713b54 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -321,7 +321,7 @@ static atomic_t hifn_dev_number;
 #define HIFN_PUBOPLEN_MOD_M     0x0000007f      /* modulus length mask */
 #define HIFN_PUBOPLEN_MOD_S     0               /* modulus length shift */
 #define HIFN_PUBOPLEN_EXP_M     0x0003ff80      /* exponent length mask */
-#define HIFN_PUBOPLEN_EXP_S     7               /* exponent lenght shift */
+#define HIFN_PUBOPLEN_EXP_S     7               /* exponent length shift */
 #define HIFN_PUBOPLEN_RED_M     0x003c0000      /* reducend length mask */
 #define HIFN_PUBOPLEN_RED_S     18              /* reducend length shift */
 
@@ -863,7 +863,7 @@ static int hifn_init_pubrng(struct hifn_device *dev)
                 dev->dmareg |= HIFN_DMAIER_PUBDONE;
                 hifn_write_1(dev, HIFN_1_DMA_IER, dev->dmareg);
 
-                dprintk("Chip %s: Public key engine has been sucessfully "
+                dprintk("Chip %s: Public key engine has been successfully "
                                 "initialised.\n", dev->name);
         }
 
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 6c6656d3b1e2..f17ddf37a1ed 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -17,6 +17,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
+#include <linux/gfp.h>
 
 #include <crypto/ctr.h>
 #include <crypto/des.h>
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index b21ef635f352..6f29012bcc43 100644
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -14,6 +14,7 @@
 #include <linux/kthread.h>
 #include <linux/platform_device.h>
 #include <linux/scatterlist.h>
+#include <linux/slab.h>
 
 #include "mv_cesa.h"
 /*
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 84c51e177269..2e992bc8015b 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
@@ -64,7 +65,7 @@ struct aes_ctx {
         u32 *D;
 };
 
-static DEFINE_PER_CPU(struct cword *, last_cword);
+static DEFINE_PER_CPU(struct cword *, paes_last_cword);
 
 /* Tells whether the ACE is capable to generate
    the extended key for a given key_len. */
@@ -152,9 +153,9 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
 
 ok:
         for_each_online_cpu(cpu)
-                if (&ctx->cword.encrypt == per_cpu(last_cword, cpu) ||
-                    &ctx->cword.decrypt == per_cpu(last_cword, cpu))
-                        per_cpu(last_cword, cpu) = NULL;
+                if (&ctx->cword.encrypt == per_cpu(paes_last_cword, cpu) ||
+                    &ctx->cword.decrypt == per_cpu(paes_last_cword, cpu))
+                        per_cpu(paes_last_cword, cpu) = NULL;
 
         return 0;
 }
@@ -166,7 +167,7 @@ static inline void padlock_reset_key(struct cword *cword)
 {
         int cpu = raw_smp_processor_id();
 
-        if (cword != per_cpu(last_cword, cpu))
+        if (cword != per_cpu(paes_last_cword, cpu))
 #ifndef CONFIG_X86_64
                 asm volatile ("pushfl; popfl");
 #else
@@ -176,7 +177,7 @@ static inline void padlock_reset_key(struct cword *cword)
 
 static inline void padlock_store_cword(struct cword *cword)
 {
-        per_cpu(last_cword, raw_smp_processor_id()) = cword;
+        per_cpu(paes_last_cword, raw_smp_processor_id()) = cword;
 }
 
 /*
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
index 0af80577dc7b..d3a27e0119bc 100644
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
@@ -57,6 +57,23 @@ static int padlock_sha_update(struct shash_desc *desc,
         return crypto_shash_update(&dctx->fallback, data, length);
 }
 
+static int padlock_sha_export(struct shash_desc *desc, void *out)
+{
+        struct padlock_sha_desc *dctx = shash_desc_ctx(desc);
+
+        return crypto_shash_export(&dctx->fallback, out);
+}
+
+static int padlock_sha_import(struct shash_desc *desc, const void *in)
+{
+        struct padlock_sha_desc *dctx = shash_desc_ctx(desc);
+        struct padlock_sha_ctx *ctx = crypto_shash_ctx(desc->tfm);
+
+        dctx->fallback.tfm = ctx->fallback;
+        dctx->fallback.flags = desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+        return crypto_shash_import(&dctx->fallback, in);
+}
+
 static inline void padlock_output_block(uint32_t *src,
                         uint32_t *dst, size_t count)
 {
@@ -235,7 +252,10 @@ static struct shash_alg sha1_alg = {
         .update         =       padlock_sha_update,
         .finup          =       padlock_sha1_finup,
         .final          =       padlock_sha1_final,
+        .export         =       padlock_sha_export,
+        .import         =       padlock_sha_import,
         .descsize       =       sizeof(struct padlock_sha_desc),
+        .statesize      =       sizeof(struct sha1_state),
         .base           =       {
                 .cra_name               =       "sha1",
                 .cra_driver_name        =       "sha1-padlock",
@@ -256,7 +276,10 @@ static struct shash_alg sha256_alg = {
         .update         =       padlock_sha_update,
         .finup          =       padlock_sha256_finup,
         .final          =       padlock_sha256_final,
+        .export         =       padlock_sha_export,
+        .import         =       padlock_sha_import,
         .descsize       =       sizeof(struct padlock_sha_desc),
+        .statesize      =       sizeof(struct sha256_state),
         .base           =       {
                 .cra_name               =       "sha256",
                 .cra_driver_name        =       "sha256-padlock",
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index c47ffe8a73ef..dc558a097311 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -37,6 +37,7 @@
 #include <linux/io.h>
 #include <linux/spinlock.h>
 #include <linux/rtnetlink.h>
+#include <linux/slab.h>
 
 #include <crypto/algapi.h>
 #include <crypto/aes.h>
@@ -1958,7 +1959,7 @@ err_out:
         return err;
 }
 
-static struct of_device_id talitos_match[] = {
+static const struct of_device_id talitos_match[] = {
         {
                 .compatible = "fsl,sec2.0",
         },