DivestOS/Patches/Linux_CVEs/CVE-2016-2442/ANY/0001.patch

From 6fb29c4773f632b7b6c31a8de56f55c32de3d350 Mon Sep 17 00:00:00 2001
From: Kiran Gunda <kgunda@codeaurora.org>
Date: Mon, 29 Feb 2016 13:27:50 +0530
Subject: msm: msm_bus: remove the buspm module from kernel

Remove the buspm module from msm_bus since it adds
no functionality to the bus bandwidth aggregation
driver. It is a loadable module used for profiling
purposes.

Change-Id: Ia0d21eb7e48d3cb2a74d4fae5ee4fb2fd449ea9f
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
---
 arch/arm/configs/msm8909_defconfig                 |   1 -
 arch/arm/configs/msm8909w-perf_defconfig           |   1 -
 arch/arm/configs/msm8909w_defconfig                |   1 -
 arch/arm/configs/msm8937-perf_defconfig            |   1 -
 arch/arm/configs/msm8937_defconfig                 |   1 -
 arch/arm/configs/msmcortex-perf_defconfig          |   1 -
 arch/arm/configs/msmcortex_defconfig               |   1 -
 arch/arm64/configs/msm-perf_defconfig              |   1 -
 arch/arm64/configs/msm8937-perf_defconfig          |   1 -
 arch/arm64/configs/msm8937_defconfig               |   1 -
 arch/arm64/configs/msm_defconfig                   |   1 -
 arch/arm64/configs/msmcortex-perf_defconfig        |   1 -
 arch/arm64/configs/msmcortex_defconfig             |   1 -
 drivers/platform/msm/Kconfig                       |   9 -
 drivers/platform/msm/msm_bus/Makefile              |   1 -
 drivers/platform/msm/msm_bus/msm-buspm-dev.c       | 368 ---------------------
 .../msm/msm_bus/msm_buspm_coresight_adhoc.c        |   1 +
 17 files changed, 1 insertion(+), 391 deletions(-)

diff --git a/arch/arm/configs/msm8909_defconfig b/arch/arm/configs/msm8909_defconfig
index a8ab18c..e2621aa 100644
--- a/arch/arm/configs/msm8909_defconfig
+++ b/arch/arm/configs/msm8909_defconfig
@@ -383,7 +383,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_REVID=y
 CONFIG_SPS=y
diff --git a/arch/arm/configs/msm8909w-perf_defconfig b/arch/arm/configs/msm8909w-perf_defconfig
index e6a2585..435f97e 100644
--- a/arch/arm/configs/msm8909w-perf_defconfig
+++ b/arch/arm/configs/msm8909w-perf_defconfig
@@ -407,7 +407,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm/configs/msm8909w_defconfig b/arch/arm/configs/msm8909w_defconfig
index 7e4d0308d..2a8c354 100644
--- a/arch/arm/configs/msm8909w_defconfig
+++ b/arch/arm/configs/msm8909w_defconfig
@@ -409,7 +409,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm/configs/msm8937-perf_defconfig b/arch/arm/configs/msm8937-perf_defconfig
index fd0c4e9..48c10c8 100644
--- a/arch/arm/configs/msm8937-perf_defconfig
+++ b/arch/arm/configs/msm8937-perf_defconfig
@@ -471,7 +471,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm/configs/msm8937_defconfig b/arch/arm/configs/msm8937_defconfig
index 0c3e1d1..0d89f31 100644
--- a/arch/arm/configs/msm8937_defconfig
+++ b/arch/arm/configs/msm8937_defconfig
@@ -478,7 +478,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm/configs/msmcortex-perf_defconfig b/arch/arm/configs/msmcortex-perf_defconfig
index f41e11d..be65d54 100644
--- a/arch/arm/configs/msmcortex-perf_defconfig
+++ b/arch/arm/configs/msmcortex-perf_defconfig
@@ -474,7 +474,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm/configs/msmcortex_defconfig b/arch/arm/configs/msmcortex_defconfig
index 3306d6c..c58a80a 100644
--- a/arch/arm/configs/msmcortex_defconfig
+++ b/arch/arm/configs/msmcortex_defconfig
@@ -475,7 +475,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig
index c2c0232..05efc6f 100644
--- a/arch/arm64/configs/msm-perf_defconfig
+++ b/arch/arm64/configs/msm-perf_defconfig
@@ -479,7 +479,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm64/configs/msm8937-perf_defconfig b/arch/arm64/configs/msm8937-perf_defconfig
index c697e1f..e10acc8 100644
--- a/arch/arm64/configs/msm8937-perf_defconfig
+++ b/arch/arm64/configs/msm8937-perf_defconfig
@@ -484,7 +484,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm64/configs/msm8937_defconfig b/arch/arm64/configs/msm8937_defconfig
index b05e721c..3342d55 100644
--- a/arch/arm64/configs/msm8937_defconfig
+++ b/arch/arm64/configs/msm8937_defconfig
@@ -488,7 +488,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig
index 3d907ce..7054eb2 100644
--- a/arch/arm64/configs/msm_defconfig
+++ b/arch/arm64/configs/msm_defconfig
@@ -485,7 +485,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_DEBUG_BUS_VOTER=y
 CONFIG_QPNP_POWER_ON=y
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index b3292ed..d0b9681 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -487,7 +487,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index a0176f1..8d449f9 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -491,7 +491,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y
diff --git a/drivers/platform/msm/Kconfig b/drivers/platform/msm/Kconfig
index d1fabe1..b0a9a54 100644
--- a/drivers/platform/msm/Kconfig
+++ b/drivers/platform/msm/Kconfig
@@ -16,15 +16,6 @@ config MSM_BUS_SCALING
 		for the active devices needs without keeping the clocks at max
 		frequency when a slower speed is sufficient.
 
-config MSM_BUSPM_DEV
-	tristate "MSM Bus Performance Monitor Kernel Module"
-	depends on MSM_BUS_SCALING
-	help
-	  This kernel module is used to mmap() hardware registers for the
-	  performance monitors, counters, etc. The module can also be used to
-	  allocate physical memory which is used by bus performance hardware to
-	  dump performance data
-
 config BUS_TOPOLOGY_ADHOC
 	bool "ad-hoc bus scaling topology"
 	help
diff --git a/drivers/platform/msm/msm_bus/Makefile b/drivers/platform/msm/msm_bus/Makefile
index fec4537..a58994d 100644
--- a/drivers/platform/msm/msm_bus/Makefile
+++ b/drivers/platform/msm/msm_bus/Makefile
@@ -24,4 +24,3 @@ endif
 
 
 obj-$(CONFIG_DEBUG_FS) += msm_bus_dbg.o
-obj-$(CONFIG_MSM_BUSPM_DEV) += msm-buspm-dev.o
diff --git a/drivers/platform/msm/msm_bus/msm-buspm-dev.c b/drivers/platform/msm/msm_bus/msm-buspm-dev.c
index 4d9262b..e69de29 100644
--- a/drivers/platform/msm/msm_bus/msm-buspm-dev.c
+++ b/drivers/platform/msm/msm_bus/msm-buspm-dev.c
@@ -1,368 +0,0 @@
-/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-/* #define DEBUG */
-
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/err.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/device.h>
-#include <linux/uaccess.h>
-#include <linux/miscdevice.h>
-#include <linux/dma-mapping.h>
-#include <soc/qcom/rpm-smd.h>
-#include <uapi/linux/msm-buspm-dev.h>
-
-#define MSM_BUSPM_DRV_NAME "msm-buspm-dev"
-
-#ifdef CONFIG_COMPAT
-static long
-msm_buspm_dev_compat_ioctl(struct file *filp, unsigned int cmd,
-						unsigned long arg);
-#else
-#define msm_buspm_dev_compat_ioctl NULL
-#endif
-
-static long
-msm_buspm_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
-static int msm_buspm_dev_mmap(struct file *filp, struct vm_area_struct *vma);
-static int msm_buspm_dev_release(struct inode *inode, struct file *filp);
-static int msm_buspm_dev_open(struct inode *inode, struct file *filp);
-
-static const struct file_operations msm_buspm_dev_fops = {
-	.owner		= THIS_MODULE,
-	.mmap		= msm_buspm_dev_mmap,
-	.open		= msm_buspm_dev_open,
-	.unlocked_ioctl	= msm_buspm_dev_ioctl,
-	.compat_ioctl	= msm_buspm_dev_compat_ioctl,
-	.llseek		= noop_llseek,
-	.release	= msm_buspm_dev_release,
-};
-
-struct miscdevice msm_buspm_misc = {
-	.minor	= MISC_DYNAMIC_MINOR,
-	.name	= MSM_BUSPM_DRV_NAME,
-	.fops	= &msm_buspm_dev_fops,
-};
-
-
-enum msm_buspm_spdm_res {
-	SPDM_RES_ID = 0,
-	SPDM_RES_TYPE = 0x63707362,
-	SPDM_KEY = 0x00006e65,
-	SPDM_SIZE = 4,
-};
-/*
- * Allocate kernel buffer.
- * Currently limited to one buffer per file descriptor.  If alloc() is
- * called twice for the same descriptor, the original buffer is freed.
- * There is also no locking protection so the same descriptor can not be shared.
- */
-
-static inline void *msm_buspm_dev_get_vaddr(struct file *filp)
-{
-	struct msm_buspm_map_dev *dev = filp->private_data;
-
-	return (dev) ? dev->vaddr : NULL;
-}
-
-static inline unsigned int msm_buspm_dev_get_buflen(struct file *filp)
-{
-	struct msm_buspm_map_dev *dev = filp->private_data;
-
-	return dev ? dev->buflen : 0;
-}
-
-static inline unsigned long msm_buspm_dev_get_paddr(struct file *filp)
-{
-	struct msm_buspm_map_dev *dev = filp->private_data;
-
-	return (dev) ? dev->paddr : 0L;
-}
-
-static void msm_buspm_dev_free(struct file *filp)
-{
-	struct msm_buspm_map_dev *dev = filp->private_data;
-
-	if (dev && dev->vaddr) {
-		pr_debug("freeing memory at 0x%p\n", dev->vaddr);
-		dma_free_coherent(msm_buspm_misc.this_device, dev->buflen,
-							dev->vaddr, dev->paddr);
-		dev->paddr = 0L;
-		dev->vaddr = NULL;
-	}
-}
-
-static int msm_buspm_dev_open(struct inode *inode, struct file *filp)
-{
-	struct msm_buspm_map_dev *dev;
-
-	if (capable(CAP_SYS_ADMIN)) {
-		dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-		if (dev)
-			filp->private_data = dev;
-		else
-			return -ENOMEM;
-	} else {
-		return -EPERM;
-	}
-
-	return 0;
-}
-
-static int
-msm_buspm_dev_alloc(struct file *filp, struct buspm_alloc_params data)
-{
-	dma_addr_t paddr;
-	void *vaddr;
-	struct msm_buspm_map_dev *dev = filp->private_data;
-
-	/* If buffer already allocated, then free it */
-	if (dev->vaddr)
-		msm_buspm_dev_free(filp);
-
-	/* Allocate uncached memory */
-	vaddr = dma_alloc_coherent(msm_buspm_misc.this_device, data.size,
-							&paddr, GFP_KERNEL);
-
-	if (vaddr == NULL) {
-		pr_err("allocation of 0x%zu bytes failed", data.size);
-		return -ENOMEM;
-	}
-
-	dev->vaddr = vaddr;
-	dev->paddr = paddr;
-	dev->buflen = data.size;
-	filp->f_pos = 0;
-	pr_debug("virt addr = 0x%p\n", dev->vaddr);
-	pr_debug("phys addr = 0x%lx\n", dev->paddr);
-
-	return 0;
-}
-
-static int msm_bus_rpm_req(u32 rsc_type, u32 key, u32 hwid,
-	int ctx, u32 val)
-{
-	struct msm_rpm_request *rpm_req;
-	int ret, msg_id;
-
-	rpm_req = msm_rpm_create_request(ctx, rsc_type, SPDM_RES_ID, 1);
-	if (rpm_req == NULL) {
-		pr_err("RPM: Couldn't create RPM Request\n");
-		return -ENXIO;
-	}
-
-	ret = msm_rpm_add_kvp_data(rpm_req, key, (const uint8_t *)&val,
-		(int)(sizeof(uint32_t)));
-	if (ret) {
-		pr_err("RPM: Add KVP failed for RPM Req:%u\n",
-			rsc_type);
-		goto err;
-	}
-
-	pr_debug("Added Key: %d, Val: %u, size: %zu\n", key,
-		(uint32_t)val, sizeof(uint32_t));
-	msg_id = msm_rpm_send_request(rpm_req);
-	if (!msg_id) {
-		pr_err("RPM: No message ID for req\n");
-		ret = -ENXIO;
-		goto err;
-	}
-
-	ret = msm_rpm_wait_for_ack(msg_id);
-	if (ret) {
-		pr_err("RPM: Ack failed\n");
-		goto err;
-	}
-
-err:
-	msm_rpm_free_request(rpm_req);
-	return ret;
-}
-
-static int msm_buspm_ioc_cmds(uint32_t arg)
-{
-	switch (arg) {
-	case MSM_BUSPM_SPDM_CLK_DIS:
-	case MSM_BUSPM_SPDM_CLK_EN:
-		return msm_bus_rpm_req(SPDM_RES_TYPE, SPDM_KEY, 0,
-				MSM_RPM_CTX_ACTIVE_SET, arg);
-	default:
-		pr_warn("Unsupported ioctl command: %d\n", arg);
-		return -EINVAL;
-	}
-}
-
-
-
-static long
-msm_buspm_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-{
-	struct buspm_xfer_req xfer;
-	struct buspm_alloc_params alloc_data;
-	unsigned long paddr;
-	int retval = 0;
-	void *buf = msm_buspm_dev_get_vaddr(filp);
-	unsigned int buflen = msm_buspm_dev_get_buflen(filp);
-	unsigned char *dbgbuf = buf;
-
-	if (_IOC_TYPE(cmd) != MSM_BUSPM_IOC_MAGIC) {
-		pr_err("Wrong IOC_MAGIC.Exiting\n");
-		return -ENOTTY;
-	}
-
-	switch (cmd) {
-	case MSM_BUSPM_IOC_FREE:
-		pr_debug("cmd = 0x%x (FREE)\n", cmd);
-		msm_buspm_dev_free(filp);
-		break;
-
-	case MSM_BUSPM_IOC_ALLOC:
-		pr_debug("cmd = 0x%x (ALLOC)\n", cmd);
-		retval = __get_user(alloc_data.size, (uint32_t __user *)arg);
-
-		if (retval == 0)
-			retval = msm_buspm_dev_alloc(filp, alloc_data);
-		break;
-
-	case MSM_BUSPM_IOC_RD_PHYS_ADDR:
-		pr_debug("Read Physical Address\n");
-		paddr = msm_buspm_dev_get_paddr(filp);
-		if (paddr == 0L) {
-			retval = -EINVAL;
-		} else {
-			pr_debug("phys addr = 0x%lx\n", paddr);
-			retval = __put_user(paddr,
-				(unsigned long __user *)arg);
-		}
-		break;
-
-	case MSM_BUSPM_IOC_RDBUF:
-		if (!buf) {
-			retval = -EINVAL;
-			break;
-		}
-
-		pr_debug("Read Buffer: 0x%x%x%x%x\n",
-				dbgbuf[0], dbgbuf[1], dbgbuf[2], dbgbuf[3]);
-
-		if (copy_from_user(&xfer, (void __user *)arg, sizeof(xfer))) {
-			retval = -EFAULT;
-			break;
-		}
-
-		if ((xfer.size <= buflen) &&
-			(copy_to_user((void __user *)xfer.data, buf,
-					xfer.size))) {
-			retval = -EFAULT;
-			break;
-		}
-		break;
-
-	case MSM_BUSPM_IOC_WRBUF:
-		pr_debug("Write Buffer\n");
-
-		if (!buf) {
-			retval = -EINVAL;
-			break;
-		}
-
-		if (copy_from_user(&xfer, (void __user *)arg, sizeof(xfer))) {
-			retval = -EFAULT;
-			break;
-		}
-
-		if ((buflen <= xfer.size) &&
-			(copy_from_user(buf, (void __user *)xfer.data,
-			xfer.size))) {
-			retval = -EFAULT;
-			break;
-		}
-		break;
-
-	case MSM_BUSPM_IOC_CMD:
-		pr_debug("IOCTL command: cmd: %d arg: %lu\n", cmd, arg);
-		retval = msm_buspm_ioc_cmds(arg);
-		break;
-
-	default:
-		pr_debug("Unknown command 0x%x\n", cmd);
-		retval = -EINVAL;
-		break;
-	}
-
-	return retval;
-}
-
-static int msm_buspm_dev_release(struct inode *inode, struct file *filp)
-{
-	struct msm_buspm_map_dev *dev = filp->private_data;
-
-	msm_buspm_dev_free(filp);
-	kfree(dev);
-	filp->private_data = NULL;
-
-	return 0;
-}
-
-static int msm_buspm_dev_mmap(struct file *filp, struct vm_area_struct *vma)
-{
-	pr_debug("vma = 0x%p\n", vma);
-
-	/* Mappings are uncached */
-	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-	if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-		vma->vm_end - vma->vm_start, vma->vm_page_prot))
-		return -EFAULT;
-
-	return 0;
-}
-
-#ifdef CONFIG_COMPAT
-static long
-msm_buspm_dev_compat_ioctl(struct file *filp, unsigned int cmd,
-						unsigned long arg)
-{
-	return msm_buspm_dev_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));
-}
-#endif
-
-static int __init msm_buspm_dev_init(void)
-{
-	int ret = 0;
-
-	ret = misc_register(&msm_buspm_misc);
-	if (ret < 0) {
-		WARN_ON(1);
-		return ret;
-	}
-
-	if (msm_buspm_misc.this_device->coherent_dma_mask == 0)
-		msm_buspm_misc.this_device->coherent_dma_mask =
-							DMA_BIT_MASK(32);
-
-	return ret;
-}
-
-static void __exit msm_buspm_dev_exit(void)
-{
-	misc_deregister(&msm_buspm_misc);
-}
-module_init(msm_buspm_dev_init);
-module_exit(msm_buspm_dev_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_VERSION("1.0");
-MODULE_ALIAS("platform:"MSM_BUSPM_DRV_NAME);
diff --git a/drivers/platform/msm/msm_bus/msm_buspm_coresight_adhoc.c b/drivers/platform/msm/msm_bus/msm_buspm_coresight_adhoc.c
index 9aec824..00b6e9a3 100644
--- a/drivers/platform/msm/msm_bus/msm_buspm_coresight_adhoc.c
+++ b/drivers/platform/msm/msm_bus/msm_buspm_coresight_adhoc.c
@@ -135,6 +135,7 @@ int msmbus_coresight_init_adhoc(struct platform_device *pdev,
 		return PTR_ERR(pdata);
 
 	drvdata = platform_get_drvdata(pdev);
+	dev_info(dev, "info: removed buspm module from kernel space\n");
 	if (IS_ERR_OR_NULL(drvdata)) {
 		drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
 		if (!drvdata) {
-- 
cgit v1.1