pstore update
- Fix linking when crypto API disabled (Matteo Croce) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAl8oWy4WHGtlZXNjb29r QGNocm9taXVtLm9yZwAKCRCJcvTf3G3AJtKnD/9k74pkcsl/xeB4KR4XRxmdKxwq 1wCfhrd7PRoUu1it7rrhGeAxFIyWfu+WTZKRqce5OwKgqx8BF4T1dpCuyOqHSMSz O5UyRHiPl43EJHs7jvOVR7V5cjQx57SeaHxxtV/PGofNUTFqLVa0w9Pxh5Ma4nfT R8j71qXOceHiwU/roHY+52vvwIMiixrgKmFfQb5klmoAQsUGXMiZYPkoelA7P4+S M7OUL/GfLBFLH2IYbCEB4YBhX127PJIL74jIOpdvT/KsAFep4PCOD0a2qPH+FrF5 DVlF2BbGpbPg+uvFWu6gU6AZC/S+D7ZnV4cDVvg4ZNknJS8XEbZNIM1EgLPbKy0C GzblUZdlA6KyEwIh9oAMiL9zjL3dianLq/mlSi8kKdiFmI2zNmwhQzW+xFgoEbRS fgGG9wcAejM5X9YqHs2BO5TLvJ7qBLHzaQceEL2Z6ZNIm7rU4grX6HD7MD93SMOu BA9O6tliYEDApSBNFLUKAlE8CGlwKjFdwgzbw7malm254uVQrCeICWVdo+caKFZr JXjEgls2gYNM7oAME1MUksy5xzwqLjXmSWJXVCud+CjYaKoyAM5Po97sQr4aYXcu F8zUdFGoy148IFi59xYZZKczLlyItCEr9OpCDA78V6MNiup0in4LhAERSPC8Ljw+ 5LpiI0IIJFshcGhriA== =gGdN -----END PGP SIGNATURE----- Merge tag 'pstore-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux Pull pstore update from Kees Cook: "A tiny pstore update which fixes a very corner-case build failure: - Fix linking when crypto API disabled (Matteo Croce)" * tag 'pstore-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore: Fix linking when crypto API disabled
This commit is contained in:
Коммит
19a93823cf
|
@ -269,6 +269,9 @@ static int pstore_compress(const void *in, void *out,
|
|||
{
|
||||
int ret;
|
||||
|
||||
if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION))
|
||||
return -EINVAL;
|
||||
|
||||
ret = crypto_comp_compress(tfm, in, inlen, out, &outlen);
|
||||
if (ret) {
|
||||
pr_err("crypto_comp_compress failed, ret = %d!\n", ret);
|
||||
|
@ -668,7 +671,7 @@ static void decompress_record(struct pstore_record *record)
|
|||
int unzipped_len;
|
||||
char *unzipped, *workspace;
|
||||
|
||||
if (!record->compressed)
|
||||
if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION) || !record->compressed)
|
||||
return;
|
||||
|
||||
/* Only PSTORE_TYPE_DMESG support compression. */
|
||||
|
|
Загрузка…
Ссылка в новой задаче