From: Ralf Baechle <ralf@linux-mips.org>
To: Tony Wu <tung7970@gmail.com>
Cc: linux-mips@linux-mips.org, stable@vger.kernel.org,
Markos Chandras <markos.chandras@imgtec.com>
Subject: Re: [PATCH v2] MIPS: kernel: proc: Fix typo in proc.c
Date: Tue, 10 Nov 2015 10:37:34 +0100 [thread overview]
Message-ID: <20151110093733.GA29184@linux-mips.org> (raw)
In-Reply-To: <20151105001612-tung7970@googlemail.com>
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
prev parent reply other threads:[~2015-11-10 9:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151110093733.GA29184@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=linux-mips@linux-mips.org \
--cc=markos.chandras@imgtec.com \
--cc=stable@vger.kernel.org \
--cc=tung7970@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.