MIPS: module: Make consistent use of pr_*()
The module relocation handling code has inconsistent use of printk() and pr_*() functions. Convert printk() calls to use pr_err() and pr_warn(). [paul.burton@imgtec.com: Do the same thing in module.c] Signed-off-by: Steven J. Hill <sjhill@realitydiluted.com> Signed-off-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: Andrey Konovalov <adech.fo@gmail.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/12433/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
43aff742b6
commit
55d791f37c
|
@ -35,15 +35,13 @@ static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v)
|
||||||
static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
|
static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
|
||||||
{
|
{
|
||||||
if (v % 4) {
|
if (v % 4) {
|
||||||
pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
|
pr_err("module %s: dangerous R_MIPS_26 RELA relocation\n",
|
||||||
me->name);
|
me->name);
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
||||||
printk(KERN_ERR
|
pr_err("module %s: relocation overflow\n", me->name);
|
||||||
"module %s: relocation overflow\n",
|
|
||||||
me->name);
|
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,7 +128,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
|
||||||
/* Ignore unresolved weak symbol */
|
/* Ignore unresolved weak symbol */
|
||||||
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
|
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
|
||||||
continue;
|
continue;
|
||||||
printk(KERN_WARNING "%s: Unknown symbol %s\n",
|
pr_warn("%s: Unknown symbol %s\n",
|
||||||
me->name, strtab + sym->st_name);
|
me->name, strtab + sym->st_name);
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,8 +73,7 @@ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
|
||||||
printk(KERN_ERR
|
pr_err("module %s: relocation overflow\n",
|
||||||
"module %s: relocation overflow\n",
|
|
||||||
me->name);
|
me->name);
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
}
|
}
|
||||||
|
@ -219,8 +218,8 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
|
||||||
/* Ignore unresolved weak symbol */
|
/* Ignore unresolved weak symbol */
|
||||||
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
|
if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
|
||||||
continue;
|
continue;
|
||||||
printk(KERN_WARNING "%s: Unknown symbol %s\n",
|
pr_warn("%s: Unknown symbol %s\n",
|
||||||
me->name, strtab + sym->st_name);
|
me->name, strtab + sym->st_name);
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue