From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3znCxt1HcdzDrhT for ; Thu, 22 Feb 2018 23:16:17 +1100 (AEDT) From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= To: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, Michael Ellerman , linux-mm@kvack.org, Joel Stanley , Christophe LEROY , =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= , Benjamin Herrenschmidt , Paul Mackerras , Vlastimil Babka , Michal Hocko , Andrew Morton , Balbir Singh , "Oliver O'Halloran" , Joe Perches Subject: [PATCH 2/5] powerpc: mm: Use memblock API for PPC32 page_is_ram Date: Thu, 22 Feb 2018 13:15:13 +0100 Message-Id: <20180222121516.23415-3-j.neuschaefer@gmx.net> In-Reply-To: <20180222121516.23415-1-j.neuschaefer@gmx.net> References: <20180222121516.23415-1-j.neuschaefer@gmx.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To support accurate checking for different blocks of memory on PPC32, use the same memblock-based approach that's already used on PPC64 also on PPC32. Signed-off-by: Jonathan Neuschäfer --- arch/powerpc/mm/mem.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index da4e1555d61d..a42b86e2a34c 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -82,11 +82,7 @@ static inline pte_t *virt_to_kpte(unsigned long vaddr) int page_is_ram(unsigned long pfn) { -#ifndef CONFIG_PPC64 /* XXX for now */ - return pfn < max_pfn; -#else return memblock_is_memory(__pfn_to_phys(pfn)); -#endif } pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, -- 2.16.1