From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756600AbcAIViJ (ORCPT ); Sat, 9 Jan 2016 16:38:09 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:60080 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756193AbcAIViH (ORCPT ); Sat, 9 Jan 2016 16:38:07 -0500 From: Guenter Roeck To: Greg Ungerer Cc: Geert Uytterhoeven , linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck , Dan Williams , Andrew Morton Subject: [PATCH -next] m68k: Declare __pfn_to_phys() for nommu case to fix build errors Date: Sat, 9 Jan 2016 13:38:02 -0800 Message-Id: <1452375482-23994-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __pfn_to_phys() was introduced with commit 8b79eb6f5b53e ("libnvdimm, pfn, pmem: allocate memmap array in persistent memory") but not declared for m68k in nommu configurations. This results in the following build error. mm/page_alloc.c: In function 'memmap_init_zone': mm/page_alloc.c:4610:9: error: implicit declaration of function '__pfn_to_phys' Fixes: 8b79eb6f5b53e ("libnvdimm, pfn, pmem: allocate memmap array in persistent memory") Cc: Dan Williams Cc: Andrew Morton Signed-off-by: Guenter Roeck --- arch/m68k/include/asm/page_no.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h index fa7f32d9836b..f389f575b93f 100644 --- a/arch/m68k/include/asm/page_no.h +++ b/arch/m68k/include/asm/page_no.h @@ -19,6 +19,8 @@ extern unsigned long memory_end; #define __pa(vaddr) ((unsigned long)(vaddr)) #define __va(paddr) ((void *)(paddr)) +#define __pfn_to_phys(pfn) PFN_PHYS(pfn) + #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) -- 2.1.4