tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict in qat Makefile.
+6
-5
+1
crypto/crypto_user.c
+1
crypto/crypto_user.c
···
440
440
[CRYPTO_MSG_NEWALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
441
441
[CRYPTO_MSG_DELALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
442
442
[CRYPTO_MSG_UPDATEALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
443
+
[CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
443
444
[CRYPTO_MSG_DELRNG - CRYPTO_MSG_BASE] = 0,
444
445
};
445
446
+2
-2
drivers/crypto/ux500/hash/hash_core.c
+2
-2
drivers/crypto/ux500/hash/hash_core.c
···
781
781
&device_data->state);
782
782
memmove(req_ctx->state.buffer,
783
783
device_data->state.buffer,
784
-
HASH_BLOCK_SIZE / sizeof(u32));
784
+
HASH_BLOCK_SIZE);
785
785
if (ret) {
786
786
dev_err(device_data->dev,
787
787
"%s: hash_resume_state() failed!\n",
···
832
832
833
833
memmove(device_data->state.buffer,
834
834
req_ctx->state.buffer,
835
-
HASH_BLOCK_SIZE / sizeof(u32));
835
+
HASH_BLOCK_SIZE);
836
836
if (ret) {
837
837
dev_err(device_data->dev, "%s: hash_save_state() failed!\n",
838
838
__func__);
+1
-1
drivers/crypto/vmx/aes_cbc.c
+1
-1
drivers/crypto/vmx/aes_cbc.c
···
182
182
.cra_name = "cbc(aes)",
183
183
.cra_driver_name = "p8_aes_cbc",
184
184
.cra_module = THIS_MODULE,
185
-
.cra_priority = 1000,
185
+
.cra_priority = 2000,
186
186
.cra_type = &crypto_blkcipher_type,
187
187
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
188
188
.cra_alignmask = 0,
+1
-1
drivers/crypto/vmx/aes_ctr.c
+1
-1
drivers/crypto/vmx/aes_ctr.c
···
166
166
.cra_name = "ctr(aes)",
167
167
.cra_driver_name = "p8_aes_ctr",
168
168
.cra_module = THIS_MODULE,
169
-
.cra_priority = 1000,
169
+
.cra_priority = 2000,
170
170
.cra_type = &crypto_blkcipher_type,
171
171
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,
172
172
.cra_alignmask = 0,
+1
-1
drivers/crypto/vmx/ppc-xlate.pl
+1
-1
drivers/crypto/vmx/ppc-xlate.pl
···
141
141
142
142
# Some ABIs specify vrsave, special-purpose register #256, as reserved
143
143
# for system use.
144
-
my $no_vrsave = ($flavour =~ /aix|linux64le/);
144
+
my $no_vrsave = ($flavour =~ /linux-ppc64le/);
145
145
my $mtspr = sub {
146
146
my ($f,$idx,$ra) = @_;
147
147
if ($idx == 256 && $no_vrsave) {