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

Commit 434be041 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge df61ff22 on remote branch 

Change-Id: I92eb14d93c998851297cf1f1c4f840f7c078100a
parents 5de55c03 df61ff22

arch/arm/configs/vendor/mdm9607-perf_defconfig

+1 −7
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ CONFIG_BT_HCIUART=y 
CONFIG_BT_HCIUART_QCA=y

CONFIG_MSM_BT_POWER=y

CONFIG_CFG80211=y

CONFIG_CFG80211_DEBUGFS=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_CFG80211_WEXT=y

CONFIG_RFKILL=y
@@ -252,12 +251,10 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y 
CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FS=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CI13XXX_MSM=y

CONFIG_USB_CI13XXX_MSM_HSIC=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_RMNET_BAM=y

CONFIG_USB_CONFIGFS_MBIM_BAM=y
@@ -285,7 +282,6 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_SW_SYNC=y

CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_ION=y
@@ -315,7 +311,6 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y 
CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_SECURE_BUFFER=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_MSM_BAM_DMUX=y

CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y

CONFIG_ARM_MEMLAT_MON=y
@@ -336,17 +331,16 @@ CONFIG_NLS_ASCII=y 
CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_PANIC_ON_RECURSIVE_FAULT=y

CONFIG_PANIC_TIMEOUT=5

CONFIG_IPC_LOGGING=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

CONFIG_CORESIGHT_SOURCE_ETM3X=y

CONFIG_CORESIGHT_DYNAMIC_REPLICATOR=y

CONFIG_CORESIGHT_STM=y

CONFIG_CORESIGHT_CPU_DEBUG=y

CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_HWEVENT=y

CONFIG_CORESIGHT_DUMMY=y

arch/arm/configs/vendor/mdm9607_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ CONFIG_USB_GADGET_VBUS_DRAW=500 
CONFIG_USB_CI13XXX_MSM=y

CONFIG_USB_CI13XXX_MSM_HSIC=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_ECM=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_RMNET_BAM=y

drivers/char/adsprpc.c

+9 −0
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ struct fastrpc_file { 
	/* Identifies the device (MINOR_NUM_DEV / MINOR_NUM_SECURE_DEV) */

	int dev_minor;

	char *debug_buf;

	/* To indicate attempt has been made to allocate memory for debug_buf */

	int debug_buf_alloced_attempted;

};



static struct fastrpc_apps gfa;
@@ -3382,6 +3384,13 @@ static int fastrpc_set_process_info(struct fastrpc_file *fl) 
	if (debugfs_root) {

		buf_size = strlen(current->comm) + strlen("_")

			+ strlen(strpid) + 1;

		spin_lock(&fl->hlock);

		if (fl->debug_buf_alloced_attempted) {

			spin_unlock(&fl->hlock);

			return err;

		}

		fl->debug_buf_alloced_attempted = 1;

		spin_unlock(&fl->hlock);

		fl->debug_buf = kzalloc(buf_size, GFP_KERNEL);

		if (!fl->debug_buf) {

			err = -ENOMEM;

drivers/clk/msm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ obj-$(CONFIG_COMMON_CLK_MSM) += clock-alpha-pll.o 
obj-$(CONFIG_COMMON_CLK_MSM)	+= clock-rpm.o

obj-$(CONFIG_COMMON_CLK_MSM)	+= clock-voter.o

obj-$(CONFIG_COMMON_CLK_MSM)	+= reset.o

ifeq ($(CONFIG_DEBUG_FS), y)

obj-$(CONFIG_COMMON_CLK_MSM)	+= clock-debug.o

endif

obj-$(CONFIG_COMMON_CLK_MSM)	+= gdsc.o



obj-$(CONFIG_MSM_CLK_CONTROLLER_V2)	+= msm-clock-controller.o

drivers/clk/msm/clock.h

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 2020, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -46,7 +46,7 @@ static inline int clock_debug_register(struct clk *unused) 
{

	return 0;

}

static inline void clock_debug_print_enabled(void) { return; }

static inline void clock_debug_print_enabled(bool unused) { return; }

#endif



#endif