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

Unverified Commit 0f5db35f authored by hmtheboy154's avatar hmtheboy154
Browse files

Merge commit 'c0fa8756' into lineage-22.2

parents 6b3170c2 c0fa8756

Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#

mainmenu "Linux/$(ARCH) $(KERNELVERSION) Kernel Configuration"



comment "Compiler: $(CC_VERSION_TEXT)"



#ifdef CONFIG_OPLUS_SYSTEM_KERNEL

config OPLUS_SYSTEM_KERNEL_QCOM

  bool "config oplus system feature "
@@ -85,7 +83,6 @@ config OPLUS_PAGEOWNER_DEBUG 
	default n

#endif /*CONFIG_OPLUS_SYSTEM_KERNEL*/





source "scripts/Kconfig.include"



source "init/Kconfig"

Makefile

+0 −6
Original line number Diff line number Diff line
@@ -596,8 +596,6 @@ endif 
ifneq ($(LLVM_IAS),1)

CLANG_FLAGS	+= -no-integrated-as

endif

CLANG_FLAGS	+= $(call cc-option, -Wno-misleading-indentation)

CLANG_FLAGS	+= $(call cc-option, -Wno-bool-operation)

CLANG_FLAGS	+= -Werror=unknown-warning-option

CLANG_FLAGS	+= $(call cc-option, -Wno-unsequenced)

KBUILD_CFLAGS	+= $(CLANG_FLAGS)
@@ -839,10 +837,6 @@ KBUILD_CFLAGS += $(call cc-option, -mllvm -disable-struct-const-merge) 


# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the

# source of a reference will be _MergedGlobals and not on of the whitelisted names.

# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

endif

arch/arm64/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -49,11 +49,7 @@ $(warning Detected assembler with broken .inst; disassembly will be unreliable) 
  endif

endif



ifeq ($(cc-name),clang)

KBUILD_CFLAGS	+= -mno-implicit-float

else

KBUILD_CFLAGS	+= -mgeneral-regs-only

endif

KBUILD_CFLAGS	+= $(lseinstr) $(brokengasinst) $(compat_vdso)

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables

KBUILD_CFLAGS	+= $(call cc-disable-warning, psabi)

drivers/crypto/msm/qce50.c

+1 −1
Original line number Diff line number Diff line
@@ -4875,7 +4875,7 @@ static int select_mode(struct qce_device *pce_dev, 
			pce_dev->intr_cadence = 0;

			atomic_set(&pce_dev->bunch_cmd_seq, 0);

			atomic_set(&pce_dev->last_intr_seq, 0);

			pce_dev->cadence_flag = ~pce_dev->cadence_flag;

			pce_dev->cadence_flag = !pce_dev->cadence_flag;

		}

	}

drivers/crypto/msm/qcedev.c

+7 −4
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ static dev_t qcedev_device_no; 
static struct class *driver_class;

static struct device *class_dev;



MODULE_DEVICE_TABLE(of, qcedev_match);



static const struct of_device_id qcedev_match[] = {

	{	.compatible = "qcom,qcedev"},

	{	.compatible = "qcom,qcedev,context-bank"},

	{}

};



MODULE_DEVICE_TABLE(of, qcedev_match);



static uint32_t qcedev_get_block_size(enum qcedev_sha_alg_enum alg)

{

	switch (alg) {
@@ -1876,6 +1876,7 @@ static inline long qcedev_ioctl(struct file *file, 
			err = -ENOTTY;

			goto exit_free_qcedev_areq;

		}

		/* Fall-through */

	case QCEDEV_IOCTL_SHA_UPDATE_REQ:

		{

		struct scatterlist sg_src;
@@ -1926,10 +1927,11 @@ static inline long qcedev_ioctl(struct file *file, 
				handle->sha_ctxt.diglen);

		mutex_unlock(&hash_access_lock);

		if (copy_to_user((void __user *)arg, &qcedev_areq->sha_op_req,

					sizeof(struct qcedev_sha_op_req)))

					sizeof(struct qcedev_sha_op_req))) {

			err = -EFAULT;

			goto exit_free_qcedev_areq;

		}

		}

		break;



	case QCEDEV_IOCTL_SHA_FINAL_REQ:
@@ -2018,10 +2020,11 @@ static inline long qcedev_ioctl(struct file *file, 
				handle->sha_ctxt.diglen);

		mutex_unlock(&hash_access_lock);

		if (copy_to_user((void __user *)arg, &qcedev_areq->sha_op_req,

					sizeof(struct qcedev_sha_op_req)))

					sizeof(struct qcedev_sha_op_req))) {

			err = -EFAULT;

			goto exit_free_qcedev_areq;

		}

		}

		break;



	case QCEDEV_IOCTL_MAP_BUF_REQ: