4.4-stable patches

added patches:
	gcov-add-support-for-gcc-version-6.patch
	gcov-support-gcc-7.1.patch

diff --git a/queue-4.4/gcov-add-support-for-gcc-version-6.patch b/queue-4.4/gcov-add-support-for-gcc-version-6.patch
new file mode 100644 (file)
index 0000000..ed711f1
--- /dev/null
+++ b/queue-4.4/gcov-add-support-for-gcc-version-6.patch
@@ -0,0 +1,32 @@
+From d02038f972538b93011d78c068f44514fbde0a8c Mon Sep 17 00:00:00 2001
+From: Florian Meier <Florian.Meier@informatik.uni-erlangen.de>
+Date: Thu, 14 Jul 2016 12:07:26 -0700
+Subject: gcov: add support for gcc version >= 6
+
+From: Florian Meier <Florian.Meier@informatik.uni-erlangen.de>
+
+commit d02038f972538b93011d78c068f44514fbde0a8c upstream.
+
+Link: http://lkml.kernel.org/r/20160701130914.GA23225@styxhp
+Signed-off-by: Florian Meier <Florian.Meier@informatik.uni-erlangen.de>
+Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+Tested-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/gcov/gcc_4_7.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/gcov/gcc_4_7.c
++++ b/kernel/gcov/gcc_4_7.c
+@@ -18,7 +18,7 @@
+ #include <linux/vmalloc.h>
+ #include "gcov.h"
+ 
+-#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
++#if (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
+ #define GCOV_COUNTERS                 10
+ #elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
+ #define GCOV_COUNTERS                 9

diff --git a/queue-4.4/gcov-support-gcc-7.1.patch b/queue-4.4/gcov-support-gcc-7.1.patch
new file mode 100644 (file)
index 0000000..bb71f6b
--- /dev/null
+++ b/queue-4.4/gcov-support-gcc-7.1.patch
@@ -0,0 +1,55 @@
+From 05384213436ab690c46d9dfec706b80ef8d671ab Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Fri, 12 May 2017 15:46:35 -0700
+Subject: gcov: support GCC 7.1
+
+From: Martin Liska <mliska@suse.cz>
+
+commit 05384213436ab690c46d9dfec706b80ef8d671ab upstream.
+
+Starting from GCC 7.1, __gcov_exit is a new symbol expected to be
+implemented in a profiling runtime.
+
+[akpm@linux-foundation.org: coding-style fixes]
+[mliska@suse.cz: v2]
+  Link: http://lkml.kernel.org/r/e63a3c59-0149-c97e-4084-20ca8f146b26@suse.cz
+Link: http://lkml.kernel.org/r/8c4084fa-3885-29fe-5fc4-0d4ca199c785@suse.cz
+Signed-off-by: Martin Liska <mliska@suse.cz>
+Acked-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/gcov/base.c    |    6 ++++++
+ kernel/gcov/gcc_4_7.c |    4 +++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+--- a/kernel/gcov/base.c
++++ b/kernel/gcov/base.c
+@@ -98,6 +98,12 @@ void __gcov_merge_icall_topn(gcov_type *
+ }
+ EXPORT_SYMBOL(__gcov_merge_icall_topn);
+ 
++void __gcov_exit(void)
++{
++      /* Unused. */
++}
++EXPORT_SYMBOL(__gcov_exit);
++
+ /**
+  * gcov_enable_events - enable event reporting through gcov_event()
+  *
+--- a/kernel/gcov/gcc_4_7.c
++++ b/kernel/gcov/gcc_4_7.c
+@@ -18,7 +18,9 @@
+ #include <linux/vmalloc.h>
+ #include "gcov.h"
+ 
+-#if (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
++#if (__GNUC__ >= 7)
++#define GCOV_COUNTERS                 9
++#elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)
+ #define GCOV_COUNTERS                 10
+ #elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
+ #define GCOV_COUNTERS                 9

diff --git a/queue-4.4/series b/queue-4.4/series
index 8ff501eae9b379343030c073a5fd048c673d3d50..f52822a8b85b83db659fb24eb0ea9b64ab5762b2 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -2,3 +2,5 @@ scsi-isci-avoid-array-subscript-warning.patch
 alsa-au88x0-fix-zero-clear-of-stream-resources.patch
 btrfs-remove-duplicate-const-specifier.patch
 i2c-jz4780-drop-superfluous-init.patch
+gcov-add-support-for-gcc-version-6.patch
+gcov-support-gcc-7.1.patch