]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
vmcore: Remove "weak" from function declarations
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Oct 2014 00:59:41 +0000 (18:59 -0600)
committerJiri Slaby <jslaby@suse.cz>
Wed, 19 Nov 2014 17:38:24 +0000 (18:38 +0100)
commitc9813eda171c8e01f62f71623aff4b0fbe79106c
tree4e3edd2f794f9a77da1fbcfc11929ec62092024e
parenteac34ad1b7643c51d9b4b96a2c6e034f49c7b7be
vmcore: Remove "weak" from function declarations

commit 5ab03ac5aaa1f032e071f1b3dc433b7839359c03 upstream.

For the following functions:

  elfcorehdr_alloc()
  elfcorehdr_free()
  elfcorehdr_read()
  elfcorehdr_read_notes()
  remap_oldmem_pfn_range()

fs/proc/vmcore.c provides default definitions explicitly marked "weak".
arch/s390 provides its own definitions intended to override the default
ones, but the "weak" attribute on the declarations applied to the s390
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 declarations so we always prefer a
non-weak definition over the weak one, independent of link order.

Fixes: be8a8d069e50 ("vmcore: introduce ELF header in new memory feature")
Fixes: 9cb218131de1 ("vmcore: introduce remap_oldmem_pfn_range()")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
CC: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
include/linux/crash_dump.h