Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d791f3 authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle
Browse files

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: default avatarSteven J. Hill <sjhill@realitydiluted.com>
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarPaul 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 43aff742

arch/mips/kernel/module-rela.c

+3 −5
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v) 
	}



	if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {

		printk(KERN_ERR

		       "module %s: relocation overflow\n",

		       me->name);

		pr_err("module %s: relocation overflow\n", me->name);

		return -ENOEXEC;

	}
@@ -130,7 +128,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, 
			/* Ignore unresolved weak symbol */

			if (ELF_ST_BIND(sym->st_info) == STB_WEAK)

				continue;

			printk(KERN_WARNING "%s: Unknown symbol %s\n",

			pr_warn("%s: Unknown symbol %s\n",

			       me->name, strtab + sym->st_name);

			return -ENOENT;

		}

arch/mips/kernel/module.c

+3 −4
Original line number Diff line number Diff line
@@ -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)) {

		printk(KERN_ERR

		       "module %s: relocation overflow\n",

		pr_err("module %s: relocation overflow\n",

		       me->name);

		return -ENOEXEC;

	}
@@ -219,7 +218,7 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab, 
			/* Ignore unresolved weak symbol */

			if (ELF_ST_BIND(sym->st_info) == STB_WEAK)

				continue;

			printk(KERN_WARNING "%s: Unknown symbol %s\n",

			pr_warn("%s: Unknown symbol %s\n",

				me->name, strtab + sym->st_name);

			return -ENOENT;

		}