Received: by 2002:ac0:a591:0:0:0:0:0 with SMTP id m17-v6csp823882imm; Thu, 5 Jul 2018 09:28:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcSdpZnTeI7fHEMcLHn/zlArVVJzNHB4DIi8uy5jHA/5spty2n8NQYdp8wW1Gh4w0c3VfHf X-Received: by 2002:a62:35c1:: with SMTP id c184-v6mr7232704pfa.18.1530808106780; Thu, 05 Jul 2018 09:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808106; cv=none; d=google.com; s=arc-20160816; b=0ZqYnRe/bbjndMB4vQ+CcdU9PInZVpiQKPlaVNI6HZMPizXrG8NussPnvj7L6Vm9k8 Rwoy+cBvlu356SbD9iz7feiLWpZ0DpAQQsQLO1iecuULXJsyCZ8ImkRJbGzNgcv7PUQi tAyLA+yqJ4L8X5rXgYE9RkTEfCom0kpYD7aPAjbNvjmYbU1jIURRFW2YoHCAWDxWWFLc vR+uLqEHRrNXb5S3G6lqj4j2/18YQg7a8w1hKeA3bKBzcJn/5aBsRf9r7ONJguEM37tX nH7CrezGa5kVhR9XUL3gZYSWLfdl7y6QhACXsOw6gpt6zz/jFqu/Z2B4TXca1xo7lFOj UXnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:arc-authentication-results; bh=uYUhbDFaCXA6bj90ofop3OJ/xGK21ViDelfc9+I13J4=; b=FSoRLlhxGZy6h50nuY4/+f+LGjsHMpUclvvFRx+0my+9rFwEyfYeYpcp02IsGkkiYY s53cOmh+Qd7DTzJTh4IHQ91yb6taqUSpl3FcqX0gWOp0rv1E5BQY5ZiBxwhvbACrTQDZ 7DA2auqhgmVSzFZ1nnWxtc6qS3bK/8X7kx3s7kpzwS/UyS2wP3Taxt7jzk1MtvTslhKC dCViR7cY0OmvGxBV5P5O1YDKEMuNwCLDu8XgrWRf13BGAcz4g84L9Ef299Sl6XWvHNFy v23AvcAN0JDpn1BTYZ4Qzf/0pqwWO5E9TG3jI2GIITHZk0XI/qAKSExkCEub1NKbwfBf 8k6w== 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 r138-v6si7062432pfc.202.2018.07.05.09.28.12; Thu, 05 Jul 2018 09:28:26 -0700 (PDT) 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 S1754347AbeGEQ0Y (ORCPT + 99 others); Thu, 5 Jul 2018 12:26:24 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:5951 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753988AbeGEQZh (ORCPT ); Thu, 5 Jul 2018 12:25:37 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 41M39h1Lsrz9ttrG; Thu, 5 Jul 2018 18:25:12 +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 hgcCayK2QliV; Thu, 5 Jul 2018 18:25:12 +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 41M39h0vV9z9ttr5; Thu, 5 Jul 2018 18:25:12 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E11F18B8CF; Thu, 5 Jul 2018 18:25:13 +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 I96DVld2wV5D; Thu, 5 Jul 2018 18:25:13 +0200 (CEST) Received: from po14934vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.4]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C3FD18B8BC; Thu, 5 Jul 2018 18:25:13 +0200 (CEST) Received: by po14934vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 9C734711E2; Thu, 5 Jul 2018 16:25:13 +0000 (UTC) Message-Id: <820e0ab274673d336c49ea47273aae18e5723af5.1530807556.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 12/16] powerpc/44x: remove page.h from mmu-44x.h To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 5 Jul 2018 16:25:13 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org mmu-44x.h doesn't need asm/page.h if PAGE_SHIFT are replaced by CONFIG_PPC_XX_PAGES Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/mmu-44x.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/mmu-44x.h b/arch/powerpc/include/asm/mmu-44x.h index 9bdbe1d1c9b9..295b3dbb2698 100644 --- a/arch/powerpc/include/asm/mmu-44x.h +++ b/arch/powerpc/include/asm/mmu-44x.h @@ -5,7 +5,6 @@ * PPC440 support */ -#include #include #define PPC44x_MMUCR_TID 0x000000ff @@ -125,19 +124,19 @@ typedef struct { /* Size of the TLBs used for pinning in lowmem */ #define PPC_PIN_SIZE (1 << 28) /* 256M */ -#if (PAGE_SHIFT == 12) +#if defined(CONFIG_PPC_4K_PAGES) #define PPC44x_TLBE_SIZE PPC44x_TLB_4K #define PPC47x_TLBE_SIZE PPC47x_TLB0_4K #define mmu_virtual_psize MMU_PAGE_4K -#elif (PAGE_SHIFT == 14) +#elif defined(CONFIG_PPC_16K_PAGES) #define PPC44x_TLBE_SIZE PPC44x_TLB_16K #define PPC47x_TLBE_SIZE PPC47x_TLB0_16K #define mmu_virtual_psize MMU_PAGE_16K -#elif (PAGE_SHIFT == 16) +#elif defined(CONFIG_PPC_64K_PAGES) #define PPC44x_TLBE_SIZE PPC44x_TLB_64K #define PPC47x_TLBE_SIZE PPC47x_TLB0_64K #define mmu_virtual_psize MMU_PAGE_64K -#elif (PAGE_SHIFT == 18) +#elif defined(CONFIG_PPC_256K_PAGES) #define PPC44x_TLBE_SIZE PPC44x_TLB_256K #define mmu_virtual_psize MMU_PAGE_256K #else -- 2.13.3