mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 14:44:12 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Merge the crypto tree to resolve conflict in qat Makefile.
This commit is contained in:
Herbert Xu 2016-07-21 12:26:55 +08:00
commit 51b259bb01
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crypto/crypto_user.c
View file

@ -440,6 +440,7 @@ static const int crypto_msg_min[CRYPTO_NR_MSGTYPES] = {
[CRYPTO_MSG_NEWALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_NEWALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
[CRYPTO_MSG_DELALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_DELALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
[CRYPTO_MSG_UPDATEALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_UPDATEALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
[CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
[CRYPTO_MSG_DELRNG - CRYPTO_MSG_BASE] = 0, [CRYPTO_MSG_DELRNG - CRYPTO_MSG_BASE] = 0,
}; };

4
drivers/crypto/ux500/hash/hash_core.c
View file

@ -781,7 +781,7 @@ static int hash_process_data(struct hash_device_data *device_data,
&device_data->state); &device_data->state);
memmove(req_ctx->state.buffer, memmove(req_ctx->state.buffer,
device_data->state.buffer, device_data->state.buffer,
HASH_BLOCK_SIZE / sizeof(u32)); HASH_BLOCK_SIZE);
if (ret) { if (ret) {
dev_err(device_data->dev, dev_err(device_data->dev,
"%s: hash_resume_state() failed!\n", "%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, memmove(device_data->state.buffer,
req_ctx->state.buffer, req_ctx->state.buffer,
HASH_BLOCK_SIZE / sizeof(u32)); HASH_BLOCK_SIZE);
if (ret) { if (ret) {
dev_err(device_data->dev, "%s: hash_save_state() failed!\n", dev_err(device_data->dev, "%s: hash_save_state() failed!\n",
__func__); __func__);

2
drivers/crypto/vmx/aes_cbc.c
View file

@ -182,7 +182,7 @@ struct crypto_alg p8_aes_cbc_alg = {
.cra_name = "cbc(aes)", .cra_name = "cbc(aes)",
.cra_driver_name = "p8_aes_cbc", .cra_driver_name = "p8_aes_cbc",
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_priority = 1000, .cra_priority = 2000,
.cra_type = &crypto_blkcipher_type, .cra_type = &crypto_blkcipher_type,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK, .cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
.cra_alignmask = 0, .cra_alignmask = 0,

2
drivers/crypto/vmx/aes_ctr.c
View file

@ -166,7 +166,7 @@ struct crypto_alg p8_aes_ctr_alg = {
.cra_name = "ctr(aes)", .cra_name = "ctr(aes)",
.cra_driver_name = "p8_aes_ctr", .cra_driver_name = "p8_aes_ctr",
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_priority = 1000, .cra_priority = 2000,
.cra_type = &crypto_blkcipher_type, .cra_type = &crypto_blkcipher_type,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK, .cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
.cra_alignmask = 0, .cra_alignmask = 0,

2
drivers/crypto/vmx/ppc-xlate.pl
View file

@ -141,7 +141,7 @@ my $vmr = sub {
# Some ABIs specify vrsave, special-purpose register #256, as reserved # Some ABIs specify vrsave, special-purpose register #256, as reserved
# for system use. # for system use.
my $no_vrsave = ($flavour =~ /aix|linux64le/); my $no_vrsave = ($flavour =~ /linux-ppc64le/);
my $mtspr = sub { my $mtspr = sub {
my ($f,$idx,$ra) = @_; my ($f,$idx,$ra) = @_;
if ($idx == 256 && $no_vrsave) { if ($idx == 256 && $no_vrsave) {