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

Unverified Commit 7265d103 authored by Johan Hovold's avatar Johan Hovold Committed by Palmer Dabbelt
Browse files

riscv: add missing newlines to printk messages 



Add missing newline characters to printk messages.

Also replace two pr_warning with the shorter pr_warn, and fix up the
tense of one error message while at it.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 41fb9d54

arch/riscv/kernel/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void print_isa(struct seq_file *f, const char *orig_isa) 
	 * a bit of info describing what went wrong.

	 */

	if (isa[0] != '\0')

		pr_info("unsupported ISA \"%s\" in device tree", orig_isa);

		pr_info("unsupported ISA \"%s\" in device tree\n", orig_isa);

}



static void print_mmu(struct seq_file *f, const char *mmu_type)

arch/riscv/kernel/cpufeature.c

+4 −4
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ void riscv_fill_hwcap(void) 
		if (riscv_of_processor_hartid(node) >= 0)

			break;

	if (!node) {

		pr_warning("Unable to find \"cpu\" devicetree entry");

		pr_warn("Unable to find \"cpu\" devicetree entry\n");

		return;

	}



	if (of_property_read_string(node, "riscv,isa", &isa)) {

		pr_warning("Unable to find \"riscv,isa\" devicetree entry");

		pr_warn("Unable to find \"riscv,isa\" devicetree entry\n");

		of_node_put(node);

		return;

	}
@@ -67,11 +67,11 @@ void riscv_fill_hwcap(void) 
	/* We don't support systems with F but without D, so mask those out

	 * here. */

	if ((elf_hwcap & COMPAT_HWCAP_ISA_F) && !(elf_hwcap & COMPAT_HWCAP_ISA_D)) {

		pr_info("This kernel does not support systems with F but not D");

		pr_info("This kernel does not support systems with F but not D\n");

		elf_hwcap &= ~COMPAT_HWCAP_ISA_F;

	}



	pr_info("elf_hwcap is 0x%lx", elf_hwcap);

	pr_info("elf_hwcap is 0x%lx\n", elf_hwcap);



#ifdef CONFIG_FPU

	if (elf_hwcap & (COMPAT_HWCAP_ISA_F | COMPAT_HWCAP_ISA_D))

arch/riscv/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int ftrace_check_current_call(unsigned long hook_pos, 
	 * return must be -EINVAL on failed comparison

	 */

	if (memcmp(expected, replaced, sizeof(replaced))) {

		pr_err("%p: expected (%08x %08x) but get (%08x %08x)",

		pr_err("%p: expected (%08x %08x) but got (%08x %08x)\n",

		       (void *)hook_pos, expected[0], expected[1], replaced[0],

		       replaced[1]);

		return -EINVAL;