Merge branch 'next/isa-string' into for-next

#ifdef CONFIG_PROC_FS

static void print_isa(struct seq_file *f, const char *orig_isa)

static void print_isa(struct seq_file *f, const char *isa)

{

	static const char *ext = "mafdcsu";

	const char *isa = orig_isa;

	const char *e;

	/*

	 * Linux doesn't support rv32e or rv128i, and we only support booting

	 * kernels on harts with the same ISA that the kernel is compiled for.

	 */

#if defined(CONFIG_32BIT)

	if (strncmp(isa, "rv32i", 5) != 0)

		return;

#elif defined(CONFIG_64BIT)

	if (strncmp(isa, "rv64i", 5) != 0)

		return;

#endif

	/* Print the base ISA, as we already know it's legal. */

	/* Print the entire ISA as it is */

	seq_puts(f, "isa\t\t: ");

	seq_write(f, isa, 5);

	isa += 5;

	/*

	 * Check the rest of the ISA string for valid extensions, printing those

	 * we find.  RISC-V ISA strings define an order, so we only print the

	 * extension bits when they're in order. Hide the supervisor (S)

	 * extension from userspace as it's not accessible from there.

	 */

	for (e = ext; *e != '\0'; ++e) {

		if (isa[0] == e[0]) {

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

				seq_write(f, isa, 1);

			isa++;

		}

	}

	seq_write(f, isa, strlen(isa));

	seq_puts(f, "\n");

	/*

	 * If we were given an unsupported ISA in the device tree then print

	 * a bit of info describing what went wrong.

	 */

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

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

}

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