summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/time.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-07-13 01:11:38 +0200
committerRalf Baechle <ralf@linux-mips.org>2015-09-03 12:07:38 +0200
commitec0b9d35d1fbf7e3a3eccc662ad641794d3685a5 (patch)
tree7270c45a53bf1b6f3ec70744a07263f83df603a6 /arch/mips/include/asm/time.h
parentMIPS: MT: Remove "weak" from vpe_run() declaration (diff)
downloadlinux-ec0b9d35d1fbf7e3a3eccc662ad641794d3685a5.tar.xz
linux-ec0b9d35d1fbf7e3a3eccc662ad641794d3685a5.zip
MIPS: Remove "weak" from get_c0_compare_int() declaration
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_compare_int() is defined in several files. Each definition is weak, so I assume Kconfig prevents two or more from being included. The caller contains default code used when get_c0_compare_int() isn't defined at all. Add a weak get_c0_compare_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 <bhelgaas@google.com> Reviewed-by: James Hogan <james.hogan@imgtec.com> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10686/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm/time.h')
-rw-r--r--arch/mips/include/asm/time.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index 8ab2874225c4..17d4cd20f18c 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -51,7 +51,7 @@ extern int __weak get_c0_perfcount_int(void);
/*
* Initialize the calling CPU's compare interrupt as clockevent device
*/
-extern unsigned int __weak get_c0_compare_int(void);
+extern unsigned int get_c0_compare_int(void);
extern int r4k_clockevent_init(void);
static inline int mips_clockevent_init(void)