From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753296Ab2B0PVD (ORCPT ); Mon, 27 Feb 2012 10:21:03 -0500 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:40127 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753118Ab2B0PVB (ORCPT ); Mon, 27 Feb 2012 10:21:01 -0500 Message-ID: <1330356057.2822.44.camel@dabdike.int.hansenpartnership.com> Subject: Re: [PATCH] parisc: fix longstanding build failures for !CONFIG_PCI From: James Bottomley To: Paul Gortmaker Cc: jejb@parisc-linux.org, kyle@mcmartin.ca, deller@gmx.de, linux-parisc@vger.kernel.org, mst@redhat.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, Randy Dunlap Date: Mon, 27 Feb 2012 09:20:57 -0600 In-Reply-To: <1330298677-17205-1-git-send-email-paul.gortmaker@windriver.com> References: <1330298677-17205-1-git-send-email-paul.gortmaker@windriver.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.1 Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 2012-02-26 at 18:24 -0500, Paul Gortmaker wrote: > Upstream commit fea80311a939a746533a6d7e7c3183729d6a3faf > > "iomap: make IOPORT/PCI mapping functions conditional" > > introduced an arch independent stub for pci_iounmap() but the > parisc had its own that was unconditionally built. So builds > since v3.0-3553-gfea8031 have been failing with: > > arch/parisc/lib/iomap.c:439:6: error: redefinition of 'pci_iounmap' > include/asm-generic/iomap.h:75:20: note: previous definition of 'pci_iounmap' was here > > Making the parisc one specific to CONFIG_PCI fixes the problem. > > CC: Randy Dunlap > Signed-off-by: Paul Gortmaker > --- > > [This fixes the linux-next builds that have been consistently failing > since last July -- http://kisskb.ellerman.id.au/kisskb/target/2069/ ] > > diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c > index fb8e10a..dc0a2c3 100644 > --- a/arch/parisc/lib/iomap.c > +++ b/arch/parisc/lib/iomap.c This should break more than just PARISC ... any non-PCI build for any arch should be broken, so this is the proposed generic fix: http://marc.info/?l=linux-parisc&m=132794183521355 James