From patchwork Thu Mar 5 14:06:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 24098 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id D9702DE0F9 for ; Fri, 6 Mar 2009 01:07:33 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from [127.0.0.1] (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 22D6ADDE06; Fri, 6 Mar 2009 01:06:56 +1100 (EST) Subject: Re: [Powerpc] Next March 5 build failure: platform/pseries/msi.o From: Michael Ellerman To: "Sachin P. Sant" In-Reply-To: <49AFB92B.8060606@in.ibm.com> References: <20090305195008.f4fd4ce0.sfr@canb.auug.org.au> <49AFB92B.8060606@in.ibm.com> Date: Fri, 06 Mar 2009 01:06:54 +1100 Message-Id: <1236262014.8325.10.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 Cc: linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org, Stephen Rothwell X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: michael@ellerman.id.au List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org On Thu, 2009-03-05 at 17:06 +0530, Sachin P. Sant wrote: > Next March 5th randconfig build fails with > > arch/powerpc/platforms/pseries/msi.c: In function find_pe_dn: > arch/powerpc/platforms/pseries/msi.c:210: error: implicit declaration of function find_device_pe > > CONFIG_EEH is not set in the config. > > Attached here is the .config. Dang it, that's my fault. Thanks for catching it Sachin. I assumed pseries always enabled EEH, but I see now you can disable it if you have EMBEDDED set (which your config does). It's a bit yucky making the MSI code depend on EEH, but the only other option would be to pull half the EEH code out - so I guess that's what I'll do. Does this patch fix it? cheers diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pse index ddc2a30..dbb5109 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -25,6 +25,11 @@ config EEH depends on PPC_PSERIES && PCI default y if !EMBEDDED +config PSERIES_MSI + bool + depends on PCI_MSI && EEH + default y + config SCANLOG tristate "Scanlog dump interface" depends on RTAS_PROC && PPC_PSERIES diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/ps index dfe574a..0ce691d 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_SCANLOG) += scanlog.o obj-$(CONFIG_EEH) += eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs. obj-$(CONFIG_KEXEC) += kexec.o obj-$(CONFIG_PCI) += pci.o pci_dlpar.o -obj-$(CONFIG_PCI_MSI) += msi.o +obj-$(CONFIG_PSERIES_MSI) += msi.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug-cpu.o obj-$(CONFIG_MEMORY_HOTPLUG) += hotplug-memory.o