Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753413AbbGNQqx (ORCPT ); Tue, 14 Jul 2015 12:46:53 -0400 Received: from mail-oi0-f48.google.com ([209.85.218.48]:36807 "EHLO mail-oi0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752566AbbGNQqu (ORCPT ); Tue, 14 Jul 2015 12:46:50 -0400 Subject: [PATCH v2 4/8] MIPS: Remove "weak" from get_c0_perfcount_int() declaration To: Ralf Baechle From: Bjorn Helgaas Cc: Andrew Bresticker , linux-mips@linux-mips.org, James Hogan , linux-kernel@vger.kernel.org Date: Tue, 14 Jul 2015 11:46:47 -0500 Message-ID: <20150714164647.1541.42503.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150714164142.1541.92710.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150714164142.1541.92710.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3737 Lines: 111 Weak header file declarations are error-prone because they make every definition weak, and the linker chooses one based on link order (see 10629d711ed7 ("PCI: Remove __weak annotation from pcibios_get_phb_of_node decl")). get_c0_perfcount_int() is defined in several files. Every definition is weak, so I assume Kconfig prevents two or more from being included. The callers contain identical default code used when get_c0_perfcount_int() isn't defined at all. Add a weak get_c0_perfcount_int() definition with the default code and remove the weak annotation from the declaration. Then the platform implementations will be strong and will override the weak default. If multiple platforms are ever configured in, we'll get a link error instead of calling a random platform's implementation. Signed-off-by: Bjorn Helgaas CC: Andrew Bresticker --- arch/mips/include/asm/time.h | 2 +- arch/mips/kernel/perf_event_mipsxx.c | 7 +------ arch/mips/kernel/time.c | 9 ++++++++- arch/mips/oprofile/op_model_mipsxx.c | 8 +------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index 8ab2874..ce6a7d5 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h @@ -46,7 +46,7 @@ extern unsigned int mips_hpt_frequency; * so it lives here. */ extern int (*perf_irq)(void); -extern int __weak get_c0_perfcount_int(void); +extern int get_c0_perfcount_int(void); /* * Initialize the calling CPU's compare interrupt as clockevent device diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index cc1b6fa..c126b1c 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -1682,12 +1682,7 @@ init_hw_perf_events(void) counters = counters_total_to_per_cpu(counters); #endif - if (get_c0_perfcount_int) - irq = get_c0_perfcount_int(); - else if (cp0_perfcount_irq >= 0) - irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq; - else - irq = -1; + irq = get_c0_perfcount_int(); mipspmu.map_raw_event = mipsxx_pmu_map_raw_event; diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 8d01709..6fff600 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -27,6 +27,7 @@ #include #include #include +#include /* * forward reference @@ -55,9 +56,15 @@ static int null_perf_irq(void) } int (*perf_irq)(void) = null_perf_irq; - EXPORT_SYMBOL(perf_irq); +int __weak get_c0_perfcount_int(void) +{ + if (cp0_perfcount_irq >= 0) + return MIPS_CPU_IRQ_BASE + cp0_perfcount_irq; + return -1; +} + /* * time_init() - it does the following things. * diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c index 6a6e2cc..c0cffa9 100644 --- a/arch/mips/oprofile/op_model_mipsxx.c +++ b/arch/mips/oprofile/op_model_mipsxx.c @@ -438,13 +438,7 @@ static int __init mipsxx_init(void) save_perf_irq = perf_irq; perf_irq = mipsxx_perfcount_handler; - if (get_c0_perfcount_int) - perfcount_irq = get_c0_perfcount_int(); - else if (cp0_perfcount_irq >= 0) - perfcount_irq = MIPS_CPU_IRQ_BASE + cp0_perfcount_irq; - else - perfcount_irq = -1; - + perfcount_irq = get_c0_perfcount_int(); if (perfcount_irq >= 0) return request_irq(perfcount_irq, mipsxx_perfcount_int, IRQF_PERCPU | IRQF_NOBALANCING | -- 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/