Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve conflict in qat Makefile.

4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index 574e87c7f2b8..9acccad26928 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -781,7 +781,7 @@ static int hash_process_data(struct hash_device_data *device_data,
                                                 &device_data->state);
                                 memmove(req_ctx->state.buffer,
                                         device_data->state.buffer,
-                                        HASH_BLOCK_SIZE / sizeof(u32));
+                                        HASH_BLOCK_SIZE);
                                 if (ret) {
                                         dev_err(device_data->dev,
                                                 "%s: hash_resume_state() failed!\n",
@@ -832,7 +832,7 @@ static int hash_process_data(struct hash_device_data *device_data,
 
                         memmove(device_data->state.buffer,
                                 req_ctx->state.buffer,
-                                HASH_BLOCK_SIZE / sizeof(u32));
+                                HASH_BLOCK_SIZE);
                         if (ret) {
                                 dev_err(device_data->dev, "%s: hash_save_state() failed!\n",
                                         __func__);
diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c
index 495577b6d31b..94ad5c0adbcb 100644
--- a/drivers/crypto/vmx/aes_cbc.c
+++ b/drivers/crypto/vmx/aes_cbc.c
@@ -182,7 +182,7 @@ struct crypto_alg p8_aes_cbc_alg = {
         .cra_name = "cbc(aes)",
         .cra_driver_name = "p8_aes_cbc",
         .cra_module = THIS_MODULE,
-        .cra_priority = 1000,
+        .cra_priority = 2000,
         .cra_type = &crypto_blkcipher_type,
         .cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
         .cra_alignmask = 0,
diff --git a/drivers/crypto/vmx/aes_ctr.c b/drivers/crypto/vmx/aes_ctr.c
index 0a3c1b04cf3c..38ed10d761d0 100644
--- a/drivers/crypto/vmx/aes_ctr.c
+++ b/drivers/crypto/vmx/aes_ctr.c
@@ -166,7 +166,7 @@ struct crypto_alg p8_aes_ctr_alg = {
         .cra_name = "ctr(aes)",
         .cra_driver_name = "p8_aes_ctr",
         .cra_module = THIS_MODULE,
-        .cra_priority = 1000,
+        .cra_priority = 2000,
         .cra_type = &crypto_blkcipher_type,
         .cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
         .cra_alignmask = 0,
diff --git a/drivers/crypto/vmx/ppc-xlate.pl b/drivers/crypto/vmx/ppc-xlate.pl
index 9f4994cabcc7..b18e67d0e065 100644
--- a/drivers/crypto/vmx/ppc-xlate.pl
+++ b/drivers/crypto/vmx/ppc-xlate.pl
@@ -141,7 +141,7 @@ my $vmr = sub {
 
 # Some ABIs specify vrsave, special-purpose register #256, as reserved
 # for system use.
-my $no_vrsave = ($flavour =~ /aix|linux64le/);
+my $no_vrsave = ($flavour =~ /linux-ppc64le/);
 my $mtspr = sub {
     my ($f,$idx,$ra) = @_;
     if ($idx == 256 && $no_vrsave) {