Commit c60f9944 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Ralf Baechle

MIPS: MT: Remove "weak" from vpe_run() declaration

Weak header file declarations are error-prone because they make every
definition weak, and the linker chooses one based on link order (see
10629d71 ("PCI: Remove __weak annotation from pcibios_get_phb_of_node
decl")).

That's not a problem for vpe_run() because Kconfig ensures there's never
more than one definition:

  - vpe_run() is defined in arch/mips/kernel/vpe-mt.c if
    CONFIG_MIPS_VPE_LOADER_MT=y

  - vpe_run() is defined in arch/mips/mti-malta/malta-amon.c if
    CONFIG_MIPS_CMP=y

  - CONFIG_MIPS_VPE_LOADER_MT cannot be set if CONFIG_MIPS_CMP=y

But it's simpler to verify correctness if we remove "weak" from the picture
and test the config symbols directly.

Remove "weak" from the vpe_run() declaration and use #if to test whether a
definition should be present.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Andrew Bresticker <abrestic@chromium.org>
Cc: linux-mips@linux-mips.org
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10684/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1c205b9c
...@@ -122,7 +122,7 @@ void release_vpe(struct vpe *v); ...@@ -122,7 +122,7 @@ void release_vpe(struct vpe *v);
void *alloc_progmem(unsigned long len); void *alloc_progmem(unsigned long len);
void release_progmem(void *ptr); void release_progmem(void *ptr);
int __weak vpe_run(struct vpe *v); int vpe_run(struct vpe *v);
void cleanup_tc(struct tc *tc); void cleanup_tc(struct tc *tc);
int __init vpe_module_init(void); int __init vpe_module_init(void);
......
...@@ -817,15 +817,11 @@ static int vpe_open(struct inode *inode, struct file *filp) ...@@ -817,15 +817,11 @@ static int vpe_open(struct inode *inode, struct file *filp)
static int vpe_release(struct inode *inode, struct file *filp) static int vpe_release(struct inode *inode, struct file *filp)
{ {
#if defined(CONFIG_MIPS_VPE_LOADER_MT) || defined(CONFIG_MIPS_VPE_LOADER_CMP)
struct vpe *v; struct vpe *v;
Elf_Ehdr *hdr; Elf_Ehdr *hdr;
int ret = 0; int ret = 0;
if (!vpe_run) {
pr_warn("VPE loader: ELF load failed.\n");
return -ENOEXEC;
}
v = get_vpe(aprp_cpu_index()); v = get_vpe(aprp_cpu_index());
if (v == NULL) if (v == NULL)
return -ENODEV; return -ENODEV;
...@@ -855,6 +851,10 @@ static int vpe_release(struct inode *inode, struct file *filp) ...@@ -855,6 +851,10 @@ static int vpe_release(struct inode *inode, struct file *filp)
v->plen = 0; v->plen = 0;
return ret; return ret;
#else
pr_warn("VPE loader: ELF load failed.\n");
return -ENOEXEC;
#endif
} }
static ssize_t vpe_write(struct file *file, const char __user *buffer, static ssize_t vpe_write(struct file *file, const char __user *buffer,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment