8 files changed, 57 insertions, 57 deletions

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 9a22434a580c..54d35c130907 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -652,7 +652,7 @@ appldata_cpu_notify(struct notifier_block *self,
         return NOTIFY_OK;
 }
 
-static struct notifier_block appldata_nb = {
+static struct notifier_block __devinitdata appldata_nb = {
         .notifier_call = appldata_cpu_notify,
 };
 
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index c5ca2dc5d428..5713c7e5bd16 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -37,10 +37,10 @@ struct s390_aes_ctx {
         int key_len;
 };
 
-static int aes_set_key(void *ctx, const u8 *in_key, unsigned int key_len,
-                       u32 *flags)
+static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+                       unsigned int key_len, u32 *flags)
 {
-        struct s390_aes_ctx *sctx = ctx;
+        struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
 
         switch (key_len) {
         case 16:
@@ -70,9 +70,9 @@ fail:
         return -EINVAL;
 }
 
-static void aes_encrypt(void *ctx, u8 *out, const u8 *in)
+static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
-        const struct s390_aes_ctx *sctx = ctx;
+        const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
 
         switch (sctx->key_len) {
         case 16:
@@ -90,9 +90,9 @@ static void aes_encrypt(void *ctx, u8 *out, const u8 *in)
         }
 }
 
-static void aes_decrypt(void *ctx, u8 *out, const u8 *in)
+static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
-        const struct s390_aes_ctx *sctx = ctx;
+        const struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
 
         switch (sctx->key_len) {
         case 16:
diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c
index e3c37aa0a199..b3f7496a79b4 100644
--- a/arch/s390/crypto/des_s390.c
+++ b/arch/s390/crypto/des_s390.c
@@ -44,10 +44,10 @@ struct crypt_s390_des3_192_ctx {
         u8 key[DES3_192_KEY_SIZE];
 };
 
-static int des_setkey(void *ctx, const u8 *key, unsigned int keylen,
-                      u32 *flags)
+static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
+                      unsigned int keylen, u32 *flags)
 {
-        struct crypt_s390_des_ctx *dctx = ctx;
+        struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
         int ret;
 
         /* test if key is valid (not a weak key) */
@@ -57,16 +57,16 @@ static int des_setkey(void *ctx, const u8 *key, unsigned int keylen,
         return ret;
 }
 
-static void des_encrypt(void *ctx, u8 *out, const u8 *in)
+static void des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
-        struct crypt_s390_des_ctx *dctx = ctx;
+        struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
 
         crypt_s390_km(KM_DEA_ENCRYPT, dctx->key, out, in, DES_BLOCK_SIZE);
 }
 
-static void des_decrypt(void *ctx, u8 *out, const u8 *in)
+static void des_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
-        struct crypt_s390_des_ctx *dctx = ctx;
+        struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
 
         crypt_s390_km(KM_DEA_DECRYPT, dctx->key, out, in, DES_BLOCK_SIZE);
 }
@@ -166,11 +166,11 @@ static struct crypto_alg des_alg = {
  *   Implementers MUST reject keys that exhibit this property.
  *
  */
-static int des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen,
-                           u32 *flags)
+static int des3_128_setkey(struct crypto_tfm *tfm, const u8 *key,
+                           unsigned int keylen, u32 *flags)
 {
         int i, ret;
-        struct crypt_s390_des3_128_ctx *dctx = ctx;
+        struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);
         const u8* temp_key = key;
 
         if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE))) {
@@ -186,17 +186,17 @@ static int des3_128_setkey(void *ctx, const u8 *key, unsigned int keylen,
         return 0;
 }
 
-static void des3_128_encrypt(void *ctx, u8 *dst, const u8 *src)
+static void des3_128_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-        struct crypt_s390_des3_128_ctx *dctx = ctx;
+        struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);
 
         crypt_s390_km(KM_TDEA_128_ENCRYPT, dctx->key, dst, (void*)src,
                       DES3_128_BLOCK_SIZE);
 }
 
-static void des3_128_decrypt(void *ctx, u8 *dst, const u8 *src)
+static void des3_128_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-        struct crypt_s390_des3_128_ctx *dctx = ctx;
+        struct crypt_s390_des3_128_ctx *dctx = crypto_tfm_ctx(tfm);
 
         crypt_s390_km(KM_TDEA_128_DECRYPT, dctx->key, dst, (void*)src,
                       DES3_128_BLOCK_SIZE);
@@ -302,11 +302,11 @@ static struct crypto_alg des3_128_alg = {
  *   property.
  *
  */
-static int des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen,
-                           u32 *flags)
+static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key,
+                           unsigned int keylen, u32 *flags)
 {
         int i, ret;
-        struct crypt_s390_des3_192_ctx *dctx = ctx;
+        struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
         const u8* temp_key = key;
 
         if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&
@@ -325,17 +325,17 @@ static int des3_192_setkey(void *ctx, const u8 *key, unsigned int keylen,
         return 0;
 }
 
-static void des3_192_encrypt(void *ctx, u8 *dst, const u8 *src)
+static void des3_192_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-        struct crypt_s390_des3_192_ctx *dctx = ctx;
+        struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
 
         crypt_s390_km(KM_TDEA_192_ENCRYPT, dctx->key, dst, (void*)src,
                       DES3_192_BLOCK_SIZE);
 }
 
-static void des3_192_decrypt(void *ctx, u8 *dst, const u8 *src)
+static void des3_192_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-        struct crypt_s390_des3_192_ctx *dctx = ctx;
+        struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
 
         crypt_s390_km(KM_TDEA_192_DECRYPT, dctx->key, dst, (void*)src,
                       DES3_192_BLOCK_SIZE);
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index 98c896b86dcd..9d34a35b1aa5 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -40,28 +40,29 @@ struct crypt_s390_sha1_ctx {
         u8 buffer[2 * SHA1_BLOCK_SIZE];
 };
 
-static void
-sha1_init(void *ctx)
+static void sha1_init(struct crypto_tfm *tfm)
 {
-        static const struct crypt_s390_sha1_ctx initstate = {
-                .state = {
-                        0x67452301,
-                        0xEFCDAB89,
-                        0x98BADCFE,
-                        0x10325476,
-                        0xC3D2E1F0
-                },
+        struct crypt_s390_sha1_ctx *ctx = crypto_tfm_ctx(tfm);
+        static const u32 initstate[5] = {
+                0x67452301,
+                0xEFCDAB89,
+                0x98BADCFE,
+                0x10325476,
+                0xC3D2E1F0
         };
-        memcpy(ctx, &initstate, sizeof(initstate));
+
+        ctx->count = 0;
+        memcpy(ctx->state, &initstate, sizeof(initstate));
+        ctx->buf_len = 0;
 }
 
-static void
-sha1_update(void *ctx, const u8 *data, unsigned int len)
+static void sha1_update(struct crypto_tfm *tfm, const u8 *data,
+                        unsigned int len)
 {
         struct crypt_s390_sha1_ctx *sctx;
         long imd_len;
 
-        sctx = ctx;
+        sctx = crypto_tfm_ctx(tfm);
         sctx->count += len * 8; //message bit length
 
         //anything in buffer yet? -> must be completed
@@ -110,10 +111,9 @@ pad_message(struct crypt_s390_sha1_ctx* sctx)
 }
 
 /* Add padding and return the message digest. */
-static void
-sha1_final(void* ctx, u8 *out)
+static void sha1_final(struct crypto_tfm *tfm, u8 *out)
 {
-        struct crypt_s390_sha1_ctx *sctx = ctx;
+        struct crypt_s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
 
         //must perform manual padding
         pad_message(sctx);
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 1ec5e92b3454..f573df30f31d 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -31,9 +31,9 @@ struct s390_sha256_ctx {
         u8 buf[2 * SHA256_BLOCK_SIZE];
 };
 
-static void sha256_init(void *ctx)
+static void sha256_init(struct crypto_tfm *tfm)
 {
-        struct s390_sha256_ctx *sctx = ctx;
+        struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
 
         sctx->state[0] = 0x6a09e667;
         sctx->state[1] = 0xbb67ae85;
@@ -44,12 +44,12 @@ static void sha256_init(void *ctx)
         sctx->state[6] = 0x1f83d9ab;
         sctx->state[7] = 0x5be0cd19;
         sctx->count = 0;
-        memset(sctx->buf, 0, sizeof(sctx->buf));
 }
 
-static void sha256_update(void *ctx, const u8 *data, unsigned int len)
+static void sha256_update(struct crypto_tfm *tfm, const u8 *data,
+                          unsigned int len)
 {
-        struct s390_sha256_ctx *sctx = ctx;
+        struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
         unsigned int index;
         int ret;
 
@@ -108,9 +108,9 @@ static void pad_message(struct s390_sha256_ctx* sctx)
 }
 
 /* Add padding and return the message digest */
-static void sha256_final(void* ctx, u8 *out)
+static void sha256_final(struct crypto_tfm *tfm, u8 *out)
 {
-        struct s390_sha256_ctx *sctx = ctx;
+        struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
 
         /* must perform manual padding */
         pad_message(sctx);
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index bad81b5832db..fbde6a915264 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -27,8 +27,8 @@ static void kexec_halt_all_cpus(void *);
 
 typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long);
 
-const extern unsigned char relocate_kernel[];
-const extern unsigned long long relocate_kernel_len;
+extern const unsigned char relocate_kernel[];
+extern const unsigned long long relocate_kernel_len;
 
 int
 machine_kexec_prepare(struct kimage *image)
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 343120c9223d..8e03219eea76 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -869,7 +869,7 @@ static int __init topology_init(void)
         int ret;
 
         for_each_possible_cpu(cpu) {
-                ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL);
+                ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
                 if (ret)
                         printk(KERN_WARNING "topology_init: register_cpu %d "
                                "failed (%d)\n", cpu, ret);
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index dfe6f0856617..1f0439dc245a 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -356,7 +356,7 @@ static void internal_add_vtimer(struct vtimer_list *timer)
 
         set_vtimer(event->expires);
         spin_unlock_irqrestore(&vt_list->lock, flags);
-        /* release CPU aquired in prepare_vtimer or mod_virt_timer() */
+        /* release CPU acquired in prepare_vtimer or mod_virt_timer() */
         put_cpu();
 }