diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-13 19:00:25 -0600 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-19 18:38:24 +0100 |
| commit | 33176fe6d29e0a689928532db6cf44de67c72921 (patch) | |
| tree | 31bc1c63a4321cef7251237b4011f3fafcd9270e | |
| parent | c9813eda171c8e01f62f71623aff4b0fbe79106c (diff) | |
kgdb: Remove "weak" from kgdb_arch_pc() declaration
commit 107bcc6d566cb40184068d888637f9aefe6252dd upstream.
kernel/debug/debug_core.c provides a default kgdb_arch_pc() definition
explicitly marked "weak". Several architectures provide their own
definitions intended to override the default, but the "weak" attribute on
the declaration applied to the arch definitions as well, so the linker
chose one based on link order (see 10629d711ed7 ("PCI: Remove __weak
annotation from pcibios_get_phb_of_node decl")).
Remove the "weak" attribute from the declaration so we always prefer a
non-weak definition over the weak one, independent of link order.
Fixes: 688b744d8bc8 ("kgdb: fix signedness mixmatches, add statics, add declaration to header")
Tested-by: Vineet Gupta <vgupta@synopsys.com> # for ARC build
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | include/linux/kgdb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h index c6e091bf39a5..bdfc95bddde9 100644 --- a/include/linux/kgdb.h +++ b/include/linux/kgdb.h @@ -283,7 +283,7 @@ struct kgdb_io { extern struct kgdb_arch arch_kgdb_ops; -extern unsigned long __weak kgdb_arch_pc(int exception, struct pt_regs *regs); +extern unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs); #ifdef CONFIG_SERIAL_KGDB_NMI extern int kgdb_register_nmi_console(void); |