summaryrefslogtreecommitdiffstats
path: root/kernel/gcov/gcc_4_7.c
diff options
context:
space:
mode:
authorLorenzo Stoakes <lstoakes@gmail.com>2015-06-30 23:57:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-01 04:44:57 +0200
commit3e44c471a2dab210f7e9b1e5f7d4d54d52df59eb (patch)
treee3d413909c8a2c969b96a94243337fa0af51163c /kernel/gcov/gcc_4_7.c
parentkernel/panic/kexec: fix "crash_kexec_post_notifiers" option issue in oops path (diff)
downloadlinux-3e44c471a2dab210f7e9b1e5f7d4d54d52df59eb.tar.xz
linux-3e44c471a2dab210f7e9b1e5f7d4d54d52df59eb.zip
gcov: add support for GCC 5.1
Fix kernel gcov support for GCC 5.1. Similar to commit a992bf836f9 ("gcov: add support for GCC 4.9"), this patch takes into account the existence of a new gcov counter (see gcc's gcc/gcov-counter.def.) Firstly, it increments GCOV_COUNTERS (to 10), which makes the data structure struct gcov_info compatible with GCC 5.1. Secondly, a corresponding counter function __gcov_merge_icall_topn (Top N value tracking for indirect calls) is included in base.c with the other gcov counters unused for kernel profiling. Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com> Cc: Andrey Ryabinin <a.ryabinin@samsung.com> Cc: Yuan Pengfei <coolypf@qq.com> Tested-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Reviewed-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>
Diffstat (limited to 'kernel/gcov/gcc_4_7.c')
-rw-r--r--kernel/gcov/gcc_4_7.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c
index 826ba9fb5e32..e25e92fb44fa 100644
--- 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__ == 4 && __GNUC_MINOR__ >= 9
+#if __GNUC__ == 5 && __GNUC_MINOR__ >= 1
+#define GCOV_COUNTERS 10
+#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9
#define GCOV_COUNTERS 9
#else
#define GCOV_COUNTERS 8