* [PATCH v2] MIPS: kernel: proc: Fix typo in proc.c
@ 2015-11-04 16:17 Tony Wu
2015-11-10 9:37 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: Tony Wu @ 2015-11-04 16:17 UTC (permalink / raw)
To: linux-mips, ralf; +Cc: stable, Markos Chandras
Fix typo introduced in commit 515a6393dbac ("MIPS: kernel: proc:
Add MIPS R6 support to /proc/cpuinfo"), mips1 should be tested
against cpu_has_mips_1, not cpu_has_mips_r1.
Signed-off-by: Tony Wu <tung7970@gmail.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: <stable@vger.kernel.org> # v4.0+
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 211fcd4..3417ce0 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -83,7 +83,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
}
seq_printf(m, "isa\t\t\t:");
- if (cpu_has_mips_r1)
+ if (cpu_has_mips_1)
seq_printf(m, " mips1");
if (cpu_has_mips_2)
seq_printf(m, "%s", " mips2");
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] MIPS: kernel: proc: Fix typo in proc.c
2015-11-04 16:17 [PATCH v2] MIPS: kernel: proc: Fix typo in proc.c Tony Wu
@ 2015-11-10 9:37 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2015-11-10 9:37 UTC (permalink / raw)
To: Tony Wu; +Cc: linux-mips, stable, Markos Chandras
On Thu, Nov 05, 2015 at 12:17:44AM +0800, Tony Wu wrote:
> Fix typo introduced in commit 515a6393dbac ("MIPS: kernel: proc:
> Add MIPS R6 support to /proc/cpuinfo"), mips1 should be tested
> against cpu_has_mips_1, not cpu_has_mips_r1.
>
> Signed-off-by: Tony Wu <tung7970@gmail.com>
> Cc: Markos Chandras <markos.chandras@imgtec.com>
> Cc: <stable@vger.kernel.org> # v4.0+
>
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index 211fcd4..3417ce0 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -83,7 +83,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> }
>
> seq_printf(m, "isa\t\t\t:");
> - if (cpu_has_mips_r1)
> + if (cpu_has_mips_1)
> seq_printf(m, " mips1");
> if (cpu_has_mips_2)
> seq_printf(m, "%s", " mips2");
Applied - but when I applied the patch I got
/home/ralf/src/linux/linux-mips/.git/rebase-apply/patch:8: trailing whitespace.
seq_printf(m, "isa\t\t\t:");
warning: 1 line adds whitespace errors.
which correct but a bit funny because the line git is complaining about
isn't even being changed.
Ralf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-10 9:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-04 16:17 [PATCH v2] MIPS: kernel: proc: Fix typo in proc.c Tony Wu
2015-11-10 9:37 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).