Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752374AbbFALL3 (ORCPT ); Mon, 1 Jun 2015 07:11:29 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:34375 "EHLO e06smtp13.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751322AbbFALLX (ORCPT ); Mon, 1 Jun 2015 07:11:23 -0400 Message-ID: <556C3DE1.2010004@linux.vnet.ibm.com> Date: Mon, 01 Jun 2015 13:11:29 +0200 From: Peter Oberparleiter MIME-Version: 1.0 To: Lorenzo Stoakes , akpm@linux-foundation.org CC: a.ryabinin@samsung.com, coolypf@qq.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH] gcov: add support for GCC 5.1 References: <1432940676-16074-1-git-send-email-lstoakes@gmail.com> In-Reply-To: <1432940676-16074-1-git-send-email-lstoakes@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15060111-0013-0000-0000-00000435D799 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2293 Lines: 69 On 30.05.2015 01:04, Lorenzo Stoakes wrote: > This patch fixes kernel gcov support for GCC 5.1. Similar to commit > a992bf836f9c3039a16f4bd068d161c86c6c3e2c 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. Looks sane and tests finished successfully on s390 with GCC 5.1.0 and GCC 4.9.2. Tested-by: Peter Oberparleiter Reviewed-by: Peter Oberparleiter > Signed-off-by: Lorenzo Stoakes > --- > kernel/gcov/base.c | 6 ++++++ > kernel/gcov/gcc_4_7.c | 4 +++- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c > index a744098..7080ae1 100644 > --- a/kernel/gcov/base.c > +++ b/kernel/gcov/base.c > @@ -92,6 +92,12 @@ void __gcov_merge_time_profile(gcov_type *counters, unsigned int n_counters) > } > EXPORT_SYMBOL(__gcov_merge_time_profile); > > +void __gcov_merge_icall_topn(gcov_type *counters, unsigned int n_counters) > +{ > + /* Unused. */ > +} > +EXPORT_SYMBOL(__gcov_merge_icall_topn); > + > /** > * gcov_enable_events - enable event reporting through gcov_event() > * > diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c > index 826ba9f..e25e92f 100644 > --- a/kernel/gcov/gcc_4_7.c > +++ b/kernel/gcov/gcc_4_7.c > @@ -18,7 +18,9 @@ > #include > #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 > -- > 2.4.2 > -- Peter Oberparleiter Linux on z Systems Development - IBM Germany -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/