From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752994AbcGFJEb (ORCPT <rfc822;w@1wt.eu>);
	Wed, 6 Jul 2016 05:04:31 -0400
Received: from mga03.intel.com ([134.134.136.65]:60957 "EHLO mga03.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751007AbcGFJEZ (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 6 Jul 2016 05:04:25 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.28,318,1464678000"; 
   d="scan'208";a="1001707177"
Date: Wed, 6 Jul 2016 12:04:04 +0300
From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, Kan Liang <kan.liang@intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Arnaldo Carvalho de Melo <acme@redhat.com>,
        Jiri Olsa <jolsa@redhat.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Stephane Eranian <eranian@google.com>,
        Vince Weaver <vincent.weaver@maine.edu>
Subject: Re: [PATCH] x86/perf/intel/rapl: Fix module name collision with
 powercap intel-rapl
Message-ID: <20160706090404.GJ4329@intel.com>
References: <1466694409-3620-1-git-send-email-ville.syrjala@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1466694409-3620-1-git-send-email-ville.syrjala@linux.intel.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Jun 23, 2016 at 06:06:49PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Since commit 4b6e2571bf00 ("x86/perf/intel/rapl: Make the Intel RAPL PMU driver modular")
> the rapl perf module calls itself intel-rapl. That name was
> already in use by the rapl powercap driver, which now fails to
> load if the perf module is loaded. Fix the problem by renaming the
> perf module to intel-rapl-perf, so that both modules can coexist.

Ping?

> 
> Cc: Kan Liang <kan.liang@intel.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Jiri Olsa <jolsa@redhat.com>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Stephane Eranian <eranian@google.com>
> Cc: Vince Weaver <vincent.weaver@maine.edu>
> Fixes: 4b6e2571bf00 ("x86/perf/intel/rapl: Make the Intel RAPL PMU driver modular")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  arch/x86/events/intel/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/events/intel/Makefile b/arch/x86/events/intel/Makefile
> index 3660b2cf245a..06c2baa51814 100644
> --- a/arch/x86/events/intel/Makefile
> +++ b/arch/x86/events/intel/Makefile
> @@ -1,8 +1,8 @@
>  obj-$(CONFIG_CPU_SUP_INTEL)		+= core.o bts.o cqm.o
>  obj-$(CONFIG_CPU_SUP_INTEL)		+= ds.o knc.o
>  obj-$(CONFIG_CPU_SUP_INTEL)		+= lbr.o p4.o p6.o pt.o
> -obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL)	+= intel-rapl.o
> -intel-rapl-objs				:= rapl.o
> +obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL)	+= intel-rapl-perf.o
> +intel-rapl-perf-objs			:= rapl.o
>  obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel-uncore.o
>  intel-uncore-objs			:= uncore.o uncore_nhmex.o uncore_snb.o uncore_snbep.o
>  obj-$(CONFIG_PERF_EVENTS_INTEL_CSTATE)	+= intel-cstate.o
> -- 
> 2.7.4

-- 
Ville Syrjälä
Intel OTC