From patchwork Mon Jul 23 00:35:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1225061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id AC78D3FCFC for ; Mon, 23 Jul 2012 00:39:29 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1St6cT-0004IL-Oj; Mon, 23 Jul 2012 00:35:29 +0000 Received: from mail-yx0-f177.google.com ([209.85.213.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1St6c4-0004I7-G6 for linux-arm-kernel@lists.infradead.org; Mon, 23 Jul 2012 00:35:05 +0000 Received: by yenr9 with SMTP id r9so5325646yen.36 for ; Sun, 22 Jul 2012 17:35:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=RHQYqTTI2gqwcrKMuilNSwG50Dbsci+4Ey1x7V3Nuc0=; b=wR2dUxHiwZTFl2VD9oFujNwqvHZJixdag6Gr18mFIrHlUWHXhEfvCq9A1Nm9t8SSrH d1o76LNYzYJXub3JgJTM/SZLWdq5JAOkR6wEeJQ0gMOCzzRsmNQpG10TVjerxjxI+b4r l+2Oug6V95/ui6G19kye/FygUH44YVtiAMyrREBUXnfOtSlrcrl54iA/UA5wBhjNR64Z 21amh3n4ZAu2Lh7oNI2ZLGiYsca/1z44jc441y/AQktG158cXXLP3f7CuPVoQFxeHaRp CpE+l3yUvrfMdQpetQbU/FW3JaoRKwDL6YaNpuAQtgyRrbhGlqnZQH7SFDbwZN/lgh8R EpSA== Received: by 10.100.199.14 with SMTP id w14mr3855024anf.25.1343003702400; Sun, 22 Jul 2012 17:35:02 -0700 (PDT) Received: from [10.0.1.22] ([199.27.103.159]) by mx.google.com with ESMTPS id s1sm11113004anl.8.2012.07.22.17.35.00 (version=SSLv3 cipher=OTHER); Sun, 22 Jul 2012 17:35:01 -0700 (PDT) Message-ID: <500C9C34.2030404@gmail.com> Date: Sun, 22 Jul 2012 19:35:00 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120615 Thunderbird/13.0.1 MIME-Version: 1.0 To: Arnd Bergmann Subject: Re: [GIT PULL] io.h clean-up for PCI References: <50049285.1060100@gmail.com> In-Reply-To: <50049285.1060100@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Olof Johansson , "linux-arm-kernel@lists.infradead.org" , Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On 07/16/2012 05:15 PM, Rob Herring wrote: > Arnd, > > Please pull io.h PCI clean-up series. As you suggested, lets get it in > next for test and decide later if to apply it for 3.6 or wait. > > BTW, I'll have sporadic email access over the next 2 weeks. > I found a collision with EDAC enum mem_type and ARM struct mem_type definitions. It's caused from pulling in asm/mach/map.h into asm/mach/pci.h. I've reworked things which avoids the to avoid that. You want a rebased branch with the fix and other issues you found or just the following patch? diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 188fd58..78d10a8 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -12,7 +12,6 @@ #define __ASM_MACH_PCI_H #include -#include struct pci_sys_data; struct pci_ops; @@ -63,6 +62,9 @@ void pci_common_init(struct hw_pci *); * Setup fixed I/O mapping. */ #if defined(CONFIG_PCI) && !defined(CONFIG_NEED_MACH_IO_H) +extern void vm_reserve_area_early(unsigned long addr, unsigned long size, + void *caller); + /* Called from devicemaps_init before .map_io */ static inline void __init pci_reserve_io(void) {