Received: by 10.223.185.116 with SMTP id b49csp3977548wrg; Mon, 26 Feb 2018 09:07:45 -0800 (PST) X-Google-Smtp-Source: AG47ELsmt511BUvZtTgzXNRijcq4WKyoHoe5P9n3oEJxXTecrW2MN0+wp5OBn5D6cv8OpJAZ2P34 X-Received: by 10.167.131.29 with SMTP id t29mr685285pfm.116.1519664865087; Mon, 26 Feb 2018 09:07:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519664865; cv=none; d=google.com; s=arc-20160816; b=HW5YdCXueJBmZdHciVK73bGiXqK5c6CEIeGCMQwMZI01TOQb2nJPJqrJK58SctyYYn qLqbN7iF4LBerYgHaJEpMyOVmRXzSaP5vKpTAkg2Ky5VUeGNZDEQzqck6+2kR0QKWseg 8UllwtooCrU7xit6SKOM9Wi6NB7UxZ7U77FscpPX347iESV4HOZnmYGRaTQmd5SARzVt kr1nXKFquMEaJuxhBrlg5DcI8sPxcFMRD9wNAG25AKlMSgpVNZGtHpX88RvKh6fszS9u E9FQVJhFF6OTrlWc6ucDLWxT/obQa59k5gIukroz50QON5jQ9bfMnqDg1zoz7j6fjZh7 1AYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=74EpYTDg0rXg+dUqGGb8d96+vvvKNYG0jiiljFMHMow=; b=IzDwPAkP5y4AlEiz+of8T3Ej5rupXK2GnBFV5rcmlxbD8mFpExZUuyqvfniO8fUZZZ uv0J/NSFwLum2RD9jS+RhnmCLvfRU36EhMXB7vYr9ZgatYtewbFBuSjPI2OBeqzqfaxj roMqufUKZvxSUGmy019zC56QvfMmLMSjaT69z3w+zsigC8fgKj7S3osDBl+rmT0VNexQ eT7QUOXSA6e55h/jdmysE4K6aC/Dl/Y7OoXgG0UJ3LqGy7XSVHBFjZZ6h7Uy/IUx9GFH 1pM/jEizvaEXJ1auEJ9rBQvOQITgbBPj3KUEnJ0ZNl6xmr0eU9kglKTB4aTOJS4PV8SO N1dQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 11-v6si6995755plc.376.2018.02.26.09.07.28; Mon, 26 Feb 2018 09:07:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751748AbeBZRG2 (ORCPT + 99 others); Mon, 26 Feb 2018 12:06:28 -0500 Received: from 9pmail.ess.barracuda.com ([64.235.150.225]:36509 "EHLO 9pmail.ess.barracuda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751723AbeBZRGZ (ORCPT ); Mon, 26 Feb 2018 12:06:25 -0500 Received: from MIPSMAIL01.mipstec.com (mailrelay.mips.com [12.201.5.28]) by mx29.ess.sfj.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Mon, 26 Feb 2018 17:06:21 +0000 Received: from mredfearn-linux.mipstec.com (192.168.155.41) by MIPSMAIL01.mipstec.com (10.20.43.31) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 26 Feb 2018 09:03:03 -0800 From: Matt Redfearn To: James Hogan , Ralf Baechle CC: , Paul Burton , "Matt Redfearn" , , "Maciej W. Rozycki" Subject: [PATCH 2/4] MIPS: cpu-features.h: Replace __mips_isa_rev with MIPS_ISA_REV Date: Mon, 26 Feb 2018 17:02:43 +0000 Message-ID: <1519664565-10955-3-git-send-email-matt.redfearn@mips.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519664565-10955-1-git-send-email-matt.redfearn@mips.com> References: <1519664565-10955-1-git-send-email-matt.redfearn@mips.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.155.41] X-BESS-ID: 1519664770-637139-10619-123029-9 X-BESS-VER: 2018.2-r1802232356 X-BESS-Apparent-Source-IP: 12.201.5.28 X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.190443 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS59374 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the need to check that __mips_isa_rev is defined by using the newly added MIPS_ISA_REV. Signed-off-by: Matt Redfearn --- arch/mips/include/asm/cpu-features.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index 721b698bfe3c..5f74590e0bea 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h @@ -11,6 +11,7 @@ #include #include +#include #include /* @@ -493,7 +494,7 @@ # define cpu_has_perf (cpu_data[0].options & MIPS_CPU_PERF) #endif -#if defined(CONFIG_SMP) && defined(__mips_isa_rev) && (__mips_isa_rev >= 6) +#if defined(CONFIG_SMP) && (MIPS_ISA_REV >= 6) /* * Some systems share FTLB RAMs between threads within a core (siblings in * kernel parlance). This means that FTLB entries may become invalid at almost @@ -525,7 +526,7 @@ # define cpu_has_shared_ftlb_entries \ (current_cpu_data.options & MIPS_CPU_SHARED_FTLB_ENTRIES) # endif -#endif /* SMP && __mips_isa_rev >= 6 */ +#endif /* SMP && MIPS_ISA_REV >= 6 */ #ifndef cpu_has_shared_ftlb_ram # define cpu_has_shared_ftlb_ram 0 -- 2.7.4