aboutsummaryrefslogtreecommitdiff
path: root/kernel/gcov/base.c
diff options
context:
space:
mode:
authorYuan Pengfei <coolypf@qq.com>2014-06-10 15:18:39 -0700
committerMark Brown <broonie@kernel.org>2015-03-17 21:51:27 +0000
commit20fde41812594096434ce2cc40d861d79f82bc36 (patch)
treefb546dc85a1e851f432019e8089072ca74028377 /kernel/gcov/base.c
parent8ad15c3280f52cbe9782c113edb49cdc5a8b67d5 (diff)
gcov: add support for GCC 4.9
This patch handles the gcov-related changes in GCC 4.9: A new counter (time profile) is added. The total number is 9 now. A new profile merge function __gcov_merge_time_profile is added. See gcc/gcov-io.h and libgcc/libgcov-merge.c For the first change, the layout of struct gcov_info is affected. For the second one, a dummy function is added to kernel/gcov/base.c similarly. Signed-off-by: Yuan Pengfei <coolypf@qq.com> 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> (cherry picked from commit a992bf836f9c3039a16f4bd068d161c86c6c3e2c) Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'kernel/gcov/base.c')
-rw-r--r--kernel/gcov/base.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
index f45b75b713c0..b358a802fd18 100644
--- a/kernel/gcov/base.c
+++ b/kernel/gcov/base.c
@@ -85,6 +85,12 @@ void __gcov_merge_ior(gcov_type *counters, unsigned int n_counters)
}
EXPORT_SYMBOL(__gcov_merge_ior);
+void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters)
+{
+ /* Unused. */
+}
+EXPORT_SYMBOL(__gcov_merge_time_profile);
+
/**
* gcov_enable_events - enable event reporting through gcov_event()
*