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

Commit 140644be authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 0bfc6c85 on remote branch 

Change-Id: If5d18c401514ca14e8c3a65b8ef1d4de3b46163d
parents e8cfff16 0bfc6c85

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -760,12 +760,11 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) 
# See modpost pattern 2

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

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

else

endif



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

endif



KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

ifdef CONFIG_FRAME_POINTER

arch/arm64/configs/vendor/bengal-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ CONFIG_LEDS_CLASS=y 
CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_AW2016=y

CONFIG_LEDS_QTI_FLASH=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QPNP_FLASH_V2=y

arch/arm64/configs/vendor/bengal_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ CONFIG_LEDS_CLASS=y 
CONFIG_LEDS_CLASS_FLASH=y

CONFIG_LEDS_AW2016=y

CONFIG_LEDS_QTI_FLASH=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QPNP_FLASH_V2=y

drivers/char/adsprpc_compat.c

+4 −4
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ struct compat_fastrpc_ioctl_dsp_capabilities { 
static int compat_get_fastrpc_ioctl_invoke(

			struct compat_fastrpc_ioctl_invoke_crc __user *inv32,

			struct fastrpc_ioctl_invoke_crc __user **inva,

			unsigned int cmd, unsigned int sc)

			unsigned int cmd, compat_uint_t sc)

{

	compat_uint_t u;

	compat_size_t s;
@@ -520,14 +520,14 @@ long compat_fastrpc_device_ioctl(struct file *filp, unsigned int cmd, 
	case COMPAT_FASTRPC_IOCTL_INVOKE_ATTRS:

	case COMPAT_FASTRPC_IOCTL_INVOKE_CRC:

	{

		struct compat_fastrpc_ioctl_invoke_crc __user *inv32;

		struct fastrpc_ioctl_invoke_crc __user *inv;

		struct compat_fastrpc_ioctl_invoke_crc __user *inv32 = NULL;

		struct fastrpc_ioctl_invoke_crc __user *inv = NULL;



		inv32 = compat_ptr(arg);

		err = get_user(sc, &inv32->inv.sc);

		if (err)

			return err;



		inv32 = compat_ptr(arg);

		VERIFY(err, 0 == compat_get_fastrpc_ioctl_invoke(inv32,

							&inv, cmd, sc));

		if (err)

drivers/firmware/qcom/tz_log.c

+10 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.

 */

#include <linux/debugfs.h>

#include <linux/errno.h>
@@ -1238,8 +1239,15 @@ static ssize_t tzdbgfs_read(struct file *file, char __user *buf, 
	struct seq_file *seq = file->private_data;

	int tz_id = TZDBG_STATS_MAX;



	if (seq)

	if (seq) {

		if (seq->private)

			tz_id = *(int *)(seq->private);

		else {

			pr_err("%s: Seq data private null unable to proceed\n",

				 __func__);

			return 0;

		}

	}

	else {

		pr_err("%s: Seq data null unable to proceed\n", __func__);

		return 0;