Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3804636pxu; Mon, 12 Oct 2020 01:17:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxdsIR3Dbl5yKUvSZEKE2a5N2CJT1/3SvWyP7OFep6+k0R4TJCLfs/xUpThhysssm9UtT3 X-Received: by 2002:a50:f389:: with SMTP id g9mr13390249edm.367.1602490675816; Mon, 12 Oct 2020 01:17:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602490675; cv=none; d=google.com; s=arc-20160816; b=wRIcdNqb7+Dnk+KnUpHuyuFPNi7u28kmwRUVUqDxId+kgTF4fhDnNTcuJOlkaDQa1Z KTTyAS02dNqAOAz8y7rD8jHk9xo/i1TODm9Tqx0KiTQCLmnfhOXqVbKTflfbcKce6+ra //sSxhwf/aG9KeIRGtu6IOM3jBaFwfiLw3QsWZyd2XCc3wGAE4yJ13jz8OWiqdaznId5 kxu209cRevwQsJDOXGpzCGfVonwm/Uhf0qf+FbdHQyvGiQMWNA/agfG5d4uGKJ1Rxn6F uPrbUKYMk+Hk/MYkMkfITWrXaRqaedHmur+xydLB4nIwWwxPaB8zcX1WxPZIWie4hrir pzBA== 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=9d91+5c8MplJ1SZi+pObMFDEoEJ6cy0AOZMPQYLfdJ4=; b=NwIPcDjszePXtqzrV2dYCKiEAtWnxDHIT1vLyrwGPeG+TEL83wJl7lypqX+EfPcE5m 8C1W5iUYN9kZf/SplIJGuGjA8ZSgYi/zHIn5ZO/dzcisCQVPaGg20qCvj/0ApyzcoBqj LfQOT7NHwMKpzanViNl44b3ScCJZUCP3LCrEieKDh8JTs0fQg762Y57tehFh1mqBSjl0 ww/OkAbZT9jQOBfhYTNYaiO3gvTzi5pZZpLbheAJBq6WbR+dBjmlfXKhLjtE/8kVQiOx AUhukv1cWvGA0KkxS7I++VWnWqgywDNB9K2dNZ923wLKdumgtpTKUYVIhZkTbQ/wOHFm QpqA== 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 gu22si12064076ejb.0.2020.10.12.01.17.32; Mon, 12 Oct 2020 01:17:55 -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 S1726862AbgJLICd (ORCPT + 99 others); Mon, 12 Oct 2020 04:02:33 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:28260 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726492AbgJLICc (ORCPT ); Mon, 12 Oct 2020 04:02:32 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4C8rkT4dbwz9typT; Mon, 12 Oct 2020 10:02:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 9HWd4hggHV4o; Mon, 12 Oct 2020 10:02:25 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4C8rkT3cpKz9typR; Mon, 12 Oct 2020 10:02:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 8C2408B789; Mon, 12 Oct 2020 10:02:30 +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 n-ogDPEvuRDP; Mon, 12 Oct 2020 10:02:30 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.100]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 217898B788; Mon, 12 Oct 2020 10:02:30 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 123EC66441; Mon, 12 Oct 2020 08:02:30 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/mm: Remove useless #ifndef CPU_FTR_COHERENT_ICACHE in mem.c To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 12 Oct 2020 08:02:30 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 10b35d9978ac ("[PATCH] powerpc: merged asm/cputable.h"), CPU_FTR_COHERENT_ICACHE has always been defined. Remove the #ifndef CPU_FTR_COHERENT_ICACHE block. Signed-off-by: Christophe Leroy --- arch/powerpc/mm/mem.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index b7586d8c835b..2708d40c38e4 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -53,11 +53,6 @@ #include -#ifndef CPU_FTR_COHERENT_ICACHE -#define CPU_FTR_COHERENT_ICACHE 0 /* XXX for now */ -#define CPU_FTR_NOEXECUTE 0 -#endif - unsigned long long memory_limit; bool init_mem_is_free; -- 2.25.0