From patchwork Thu Nov 19 12:41:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7657001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8745D9F2EC for ; Thu, 19 Nov 2015 12:44:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF833206A5 for ; Thu, 19 Nov 2015 12:44:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0500E2069E for ; Thu, 19 Nov 2015 12:44:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzOXi-0002Qb-Np; Thu, 19 Nov 2015 12:42:26 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzOXf-0002Me-KK for linux-arm-kernel@lists.infradead.org; Thu, 19 Nov 2015 12:42:24 +0000 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0MFtVW-1aC67Q3fZm-00EttJ; Thu, 19 Nov 2015 13:41:55 +0100 From: Arnd Bergmann To: linux-mm@kvack.org Subject: [PATCH] mm: include linux/pfn.h for PHYS_PFN definition Date: Thu, 19 Nov 2015 13:41:53 +0100 Message-ID: <5841074.QcbTqgbsZz@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:MYCU7mclOJH/3Gy9rpuBTGPXCI8KYYQOdmAufjKLnWIS7okPv6N /n78yd7lSfeSkR1gbGz9CoyZgxI0h1gtINNplqpTMPnsD2B9YwDUSAgmr6QVsmik4bNyJbD 3cINl+7t6RaCDFPzxzRiz64K1e1ub2RYsYLBBdDG6ueG/kKK3+TN15Rwv0FkuhyzAOkm2pi 3lFAFy3JTuJR+wFFldwvg== X-UI-Out-Filterresults: notjunk:1; V01:K0:EDEo6GEsI6s=:VeWLTqgdWlcOKAeesNbHMa +VYZf8Pfz6i6245TjA5pN5BHMheT9cKlGT655/osFgL6nWzEXOuTE4pHSJjiWb3fm1qdtR78f 76pokpwabQ1tnkjJAnUz7pCu3TrlC7Z8rscLR6ce4YnHLXSFf/SwuMzWqurdotAWeGUWMrrHc tBh1gVhvuPTih78tMz+k1EZoByeHWnVF5gNywY4xLF1jy3MdhqCNHXmilTn/A2Xsw0StAIMmh D5MdsjIzbuX5Hnm4U8P9JkxQbYnJZ4UH1iz4vqxpkdAzujTGVBJQz7s7eLUbzDfWCBhKK8xhf 3MhG6qohbhxAWapGcAgZptEKiFSnaA8KxJa389fFWZneMCmxDw7aCaKDw3LszckSMeq7quGTN pTGQEELyhcQXPj4ZivTl/WScgQJJEmPx1u/ceKSRDuA9dofSWGhjxDlEUd0nJlSwfBcphoLWE 5rJal7HWKe2qS2XPTzIznAQP0zV77R0dpHhUQ8Ac7e1mlYL4ZXqN1FB2ZHfDN/kUA45TCJ9qH WrbhVl045woBZq0FUpsfmnyyt+XZX11aWH0PIYZfta4L2mUllcC0umEMnU0OwpkSLKa0Tjwi6 AP2UQFlQC8GZpEpJuAPki+/emljKg51lkPJfNcmaFtM3I9kYyBzeqQvYTs82oiuzKfN4wD9Ub uiWNJgG+BFZW8Bw9bPXgvbIMG6+7woaifQybGvdueQiT86rkL3NhFhUUtRhyR9N9W4i3lS2XZ ZL3TpBYy5f0bIuq6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151119_044224_060806_74C01360 X-CRM114-Status: GOOD ( 14.95 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: akpm@linux-foundation.org, Oleg Nesterov , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chen Gang Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A change to asm-generic/memory_model.h caused a new build error in some configurations: mach-clps711x/common.c:39:10: error: implicit declaration of function 'PHYS_PFN' .pfn = __phys_to_pfn(CLPS711X_PHYS_BASE), This includes the linux/pfn.h header from the same file to avoid the error. Signed-off-by: Arnd Bergmann Fixes: bf1c6c9895de ("mm: add PHYS_PFN, use it in __phys_to_pfn()") --- I was listed as 'Cc' on the original patch, but don't see it in my inbox. I can queue up the fixed version in the asm-generic tree if you like that, otherwise please fold this fixup into the patch, or drop it if we want to avoid the extra #include. diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index c785a79d9385..5148150cc80b 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h @@ -1,6 +1,8 @@ #ifndef __ASM_MEMORY_MODEL_H #define __ASM_MEMORY_MODEL_H +#include + #ifndef __ASSEMBLY__ #if defined(CONFIG_FLATMEM)