From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eddie.linux-mips.org ([148.251.95.138]:48082 "EHLO cvs.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890AbbKJJhl (ORCPT ); Tue, 10 Nov 2015 04:37:41 -0500 Received: from localhost.localdomain ([127.0.0.1]:59132 "EHLO linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by eddie.linux-mips.org with ESMTP id S27013194AbbKJJhjnGIJS (ORCPT ); Tue, 10 Nov 2015 10:37:39 +0100 Date: Tue, 10 Nov 2015 10:37:34 +0100 From: Ralf Baechle To: Tony Wu Cc: linux-mips@linux-mips.org, stable@vger.kernel.org, Markos Chandras Subject: Re: [PATCH v2] MIPS: kernel: proc: Fix typo in proc.c Message-ID: <20151110093733.GA29184@linux-mips.org> References: <20151105001612-tung7970@googlemail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151105001612-tung7970@googlemail.com> Sender: stable-owner@vger.kernel.org List-ID: 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 > Cc: Markos Chandras > Cc: # 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