Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36738f59 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fs: crypto: Fix compilation issue"

parents 3e4b94a1 401301b4

drivers/mmc/host/sdhci-msm-ice.c

+8 −0
Original line number Diff line number Diff line
@@ -351,12 +351,16 @@ int sdhci_msm_ice_cfg(struct sdhci_host *host, struct mmc_request *mrq, 
		return -EINVAL;

	req = mrq->req;

	if (req && req->bio) {

#ifdef CONFIG_PFK

		if (bio_dun(req->bio)) {

			dun = bio_dun(req->bio);

			cdu_sz = SDHCI_MSM_ICE_TR_DATA_UNIT_4_KB;

		} else {

			dun = req->__sector;

		}

#else

		dun = req->__sector;

#endif

		err = sdhci_msm_ice_get_cfg(msm_host, req, &bypass, &key_index);

		if (err)

			return err;
@@ -401,12 +405,16 @@ int sdhci_msm_ice_cmdq_cfg(struct sdhci_host *host, 
		return -EINVAL;

	req = mrq->req;

	if (req && req->bio) {

#ifdef CONFIG_PFK

		if (bio_dun(req->bio)) {

			dun = bio_dun(req->bio);

			cdu_sz = SDHCI_MSM_ICE_TR_DATA_UNIT_4_KB;

		} else {

			dun = req->__sector;

		}

#else

		dun = req->__sector;

#endif

		err = sdhci_msm_ice_get_cfg(msm_host, req, &bypass, &key_index);

		if (err)

			return err;

fs/crypto/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ obj-$(CONFIG_FS_ENCRYPTION) += fscrypto.o 
ccflags-y += -Ifs/ext4

ccflags-y += -Ifs/f2fs



fscrypto-y := crypto.o fname.o hooks.o keyinfo.o policy.o fscrypt_ice.o

fscrypto-y := crypto.o fname.o hooks.o keyinfo.o policy.o

fscrypto-$(CONFIG_BLOCK) += bio.o

fscrypto-$(CONFIG_PFK) += fscrypt_ice.o