From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-pa0-f48.google.com ([209.85.220.48]:36594 "EHLO
	mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753556AbbKDQRv (ORCPT
	<rfc822;stable@vger.kernel.org>); Wed, 4 Nov 2015 11:17:51 -0500
Received: by pacdm15 with SMTP id dm15so32750528pac.3
        for <stable@vger.kernel.org>; Wed, 04 Nov 2015 08:17:50 -0800 (PST)
Date: Thu, 5 Nov 2015 00:17:44 +0800
From: Tony Wu <tung7970@gmail.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org
Cc: stable@vger.kernel.org,
	Markos Chandras <markos.chandras@imgtec.com>
Subject: [PATCH v2] MIPS: kernel: proc: Fix typo in proc.c
Message-ID: <20151105001612-tung7970@googlemail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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");