DivestOS/Patches/Linux_CVEs/CVE-2016-2443/ANY/0001.patch
2017-11-07 17:32:46 -05:00

53 lines
1.3 KiB
Diff

diff --git a/drivers/video/msm/Kconfig b/drivers/video/msm/Kconfig
index 590723a..30ce98f 100644
--- a/drivers/video/msm/Kconfig
+++ b/drivers/video/msm/Kconfig
@@ -44,6 +44,11 @@
config FB_MSM_MDSS_COMMON
bool
+config MDP_DEBUG_FS
+ depends on DEBUG_FS
+ bool "MDP Debug FS"
+ default n
+
choice
prompt "MDP HW version"
default FB_MSM_MDP22
diff --git a/drivers/video/msm/Makefile b/drivers/video/msm/Makefile
index 67c6b48..d26fe58 100644
--- a/drivers/video/msm/Makefile
+++ b/drivers/video/msm/Makefile
@@ -9,8 +9,7 @@
ifeq ($(CONFIG_FB_MSM_MDP_HW),y)
# MDP
obj-y += mdp.o
-
-obj-$(CONFIG_DEBUG_FS) += mdp_debugfs.o
+obj-$(CONFIG_MDP_DEBUG_FS) += mdp_debugfs.o
ifeq ($(CONFIG_FB_MSM_MDP40),y)
obj-y += mdp4_util.o
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 7d6d448..7a59d51 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -2,7 +2,7 @@
*
* MSM MDP Interface (used by framebuffer core)
*
- * Copyright (c) 2007-2012, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2007-2013, 2016 The Linux Foundation. All rights reserved.
* Copyright (C) 2007 Google Incorporated
*
* This software is licensed under the terms of the GNU General Public
@@ -3257,7 +3257,7 @@
return ret;
}
-#if defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_MDP_DEBUG_FS)
mdp_debugfs_init();
#endif