Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp190125pxy; Fri, 7 May 2021 00:36:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzImMVMxrXgbL8zg231fQyy3MIQA5oOCper4e7ABLuN0C2YhsrYNCSM0Replua9aSdylYpW X-Received: by 2002:a17:906:36d1:: with SMTP id b17mr8869353ejc.235.1620373016470; Fri, 07 May 2021 00:36:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620373016; cv=none; d=google.com; s=arc-20160816; b=vW2MavKcaupHXxANTrWpp3kZRn063XfsC933MyYUC8/A0Cu7S+JdNqzo4qxZC1CqNm rAOTlCdG0mdEcsLAmG9pdeH/DJ2eyca6EppdWK5A/6eUdf1aQQDTOMMmtntk4KvO01ke RhZkCjgwdcdlT5fBiCG9SNlSAF4nZPIPW158cPyMowtwGAUl3bL+mmLwi5ggzb76sF45 YbgMry4KA3kd32zrAWm7TWOau1NMyQ4P6P+OcGCh4CFNUcDKYNY14pkVB/wATQV7H8wA 6gckLIK5kevXBcttf26TSch1ZQ28//MfuTx1EU5RmgGBTf5/RGUM9ACWFouO8PoGHNvQ akYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=qndYij3GiCL2xBmMh141g+eksYn6yOKvpUEVWlAT8mA=; b=kVZP/yFyqA95pDXCFvSguufvknNQeHeNgGd9bM5mYktBHRSz6srho7jbAqJjAR4vTC OPVDhRet9sSuuLDuBQljbB3LSx8QyKfQpuFnUuoRZmrB+xJ96fc7eU3lGjboOddYL9BY 4916MImQNXFFCTbqnoNrbT6No6vC5RkZVCKXFk8/6T2tsygHTyGktFNKIZN533RwDFJs EyQLLkf5l+i3MA6ZG/ZT/HzCtDdLxM/mXm1J6a3k2VTTqK2Jho1o5O82L2ppGlqqG9vQ z8PbNxXwv/z37QncF9AjZnb1xnt77O4YiUIQIFpDDUSjOIg706K81QHZ6bVtDIVHIOxz 1gaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id fx23si4332280ejb.550.2021.05.07.00.36.32; Fri, 07 May 2021 00:36:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232490AbhEGGCC (ORCPT + 99 others); Fri, 7 May 2021 02:02:02 -0400 Received: from pegase2.c-s.fr ([93.17.235.10]:43153 "EHLO pegase2.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229637AbhEGGCA (ORCPT ); Fri, 7 May 2021 02:02:00 -0400 Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4Fc0Dq5w4qz9sZQ; Fri, 7 May 2021 08:00:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7Mt_Wth8UqvN; Fri, 7 May 2021 08:00:59 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4Fc0Dq51PTz9sZP; Fri, 7 May 2021 08:00:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 2390E8B81A; Fri, 7 May 2021 08:00:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id LZX6P8dbh5Tq; Fri, 7 May 2021 08:00:59 +0200 (CEST) Received: from po15610vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E58C58B764; Fri, 7 May 2021 08:00:58 +0200 (CEST) Received: by po15610vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 3A61464908; Fri, 7 May 2021 06:00:58 +0000 (UTC) Message-Id: <594fa3cc0df11e21644fd6a584851ae4f164b2bf.1620367249.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH] powerpc/mmu: Remove leftover CONFIG_E200 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 7 May 2021 06:00:58 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 39c8bf2b3cc1 ("powerpc: Retire e200 core (mpc555x processor)") removed CONFIG_E200. Commit f9158d58a4e1 ("powerpc/mm: Add mask of always present MMU features") was merged in the same cycle and added a new use of CONFIG_E200. Remove that use. Fixes: f9158d58a4e1 ("powerpc/mm: Add mask of always present MMU features") Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/mmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h index 0a6a77437ab8..998fe01dd1a8 100644 --- a/arch/powerpc/include/asm/mmu.h +++ b/arch/powerpc/include/asm/mmu.h @@ -220,7 +220,7 @@ enum { #elif defined(CONFIG_44x) #define MMU_FTRS_ALWAYS MMU_FTR_TYPE_44x #endif -#if defined(CONFIG_E200) || defined(CONFIG_E500) +#ifdef CONFIG_E500 #define MMU_FTRS_ALWAYS MMU_FTR_TYPE_FSL_E #endif -- 2.25.0