Commit ee063c23 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2_update_for_v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux 

Pull nios2 fixlet from Dinh Nguyen:

 - Use str_yes_no() helper function

* tag 'nios2_update_for_v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  nios2: Use str_yes_no() helper in show_cpuinfo()
parents dea3165f 0efbca0f

arch/nios2/kernel/cpuinfo.c

+5 −5
Original line number Diff line number Diff line
@@ -143,11 +143,11 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		   " DIV:\t\t%s\n"

		   " BMX:\t\t%s\n"

		   " CDX:\t\t%s\n",

		   cpuinfo.has_mul ? "yes" : "no",

		   cpuinfo.has_mulx ? "yes" : "no",

		   cpuinfo.has_div ? "yes" : "no",

		   cpuinfo.has_bmx ? "yes" : "no",

		   cpuinfo.has_cdx ? "yes" : "no");

		   str_yes_no(cpuinfo.has_mul),

		   str_yes_no(cpuinfo.has_mulx),

		   str_yes_no(cpuinfo.has_div),

		   str_yes_no(cpuinfo.has_bmx),

		   str_yes_no(cpuinfo.has_cdx));



	seq_printf(m,

		   "Icache:\t\t%ukB, line length: %u\n",