From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 5 Apr 2017 10:11:09 +0000 (+0200)
Subject: 4.10-stable patches
X-Git-Tag: v4.9.21~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c2e8911e6601353e388fcec32ed8549dc47921a;p=thirdparty%2Fkernel%2Fstable-queue.git

4.10-stable patches

added patches:
	drm-armada-fix-compile-fail.patch
---

diff --git a/queue-4.10/drm-armada-fix-compile-fail.patch b/queue-4.10/drm-armada-fix-compile-fail.patch
new file mode 100644
index 00000000000..4c0337dbb05
--- /dev/null
+++ b/queue-4.10/drm-armada-fix-compile-fail.patch
@@ -0,0 +1,36 @@
+From 7357f89954b6d005df6ab8929759e78d7d9a80f9 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Fri, 30 Dec 2016 17:38:52 +0100
+Subject: drm/armada: Fix compile fail
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 7357f89954b6d005df6ab8929759e78d7d9a80f9 upstream.
+
+I reported the include issue for tracepoints a while ago, but nothing
+seems to have happened. Now it bit us, since the drm_mm_print
+conversion was broken for armada. Fix it, so I can re-enable armada
+in the drm-misc build configs.
+
+v2: Rebase just the compile fix on top of Chris' build fix.
+
+Cc: Russell King <rmk+kernel@armlinux.org.uk>
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Acked: Chris Wilson <chris@chris-wilson.co.uk>
+Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
+Link: http://patchwork.freedesktop.org/patch/msgid/1483115932-19584-1-git-send-email-daniel.vetter@ffwll.ch
+Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/armada/Makefile |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/armada/Makefile
++++ b/drivers/gpu/drm/armada/Makefile
+@@ -4,3 +4,5 @@ armada-y	+= armada_510.o
+ armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
+ 
+ obj-$(CONFIG_DRM_ARMADA) := armada.o
++
++CFLAGS_armada_trace.o := -I$(src)
diff --git a/queue-4.10/series b/queue-4.10/series
index dac6edf1b11..80c812f4117 100644
--- a/queue-4.10/series
+++ b/queue-4.10/series
@@ -69,3 +69,4 @@ lib-syscall-clear-return-values-when-no-stack.patch
 mm-rmap-fix-huge-file-mmap-accounting-in-the-memcg-stats.patch
 mm-workingset-fix-premature-shadow-node-shrinking-with-cgroups.patch
 mm-hugetlb-use-pte_present-instead-of-pmd_present-in-follow_huge_pmd.patch
+drm-armada-fix-compile-fail.patch