Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262596AbTIQQiz (ORCPT ); Wed, 17 Sep 2003 12:38:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262597AbTIQQiz (ORCPT ); Wed, 17 Sep 2003 12:38:55 -0400 Received: from atlrel7.hp.com ([156.153.255.213]:30158 "EHLO atlrel7.hp.com") by vger.kernel.org with ESMTP id S262596AbTIQQix (ORCPT ); Wed, 17 Sep 2003 12:38:53 -0400 From: Bjorn Helgaas To: Marcelo Tosatti Subject: [PATCH] 2.4 fix pci_generic_prep_mwi export breakage Date: Wed, 17 Sep 2003 10:38:48 -0600 User-Agent: KMail/1.5.3 Cc: jgarzik@redhat.com, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200309171038.48602.bjorn.helgaas@hp.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1746 Lines: 50 I think the recent change to pci.c to export pci_generic_prep_mwi() is incorrect. pci_generic_prep_mwi() is only defined if !HAVE_ARCH_PCI_MWI, so it is wrong to export it. In particular, it breaks on ia64, because we define HAVE_ARCH_PCI_MWI. It looks to me like the following patch should be applied. This removes the export and in fact makes pci_generic_prep_mwi() static as it is in 2.5. ===== drivers/pci/pci.c 1.45 vs edited ===== --- 1.45/drivers/pci/pci.c Sun Aug 31 07:52:15 2003 +++ edited/drivers/pci/pci.c Tue Sep 16 13:24:31 2003 @@ -921,7 +921,7 @@ * * RETURNS: An appriopriate -ERRNO error value on eror, or zero for success. */ -int +static int pci_generic_prep_mwi(struct pci_dev *dev) { u8 cacheline_size; @@ -2151,7 +2151,6 @@ EXPORT_SYMBOL(pci_set_master); EXPORT_SYMBOL(pci_set_mwi); EXPORT_SYMBOL(pci_clear_mwi); -EXPORT_SYMBOL(pci_generic_prep_mwi); EXPORT_SYMBOL(pci_set_dma_mask); EXPORT_SYMBOL(pci_dac_set_dma_mask); EXPORT_SYMBOL(pci_assign_resource); ===== include/linux/pci.h 1.34 vs edited ===== --- 1.34/include/linux/pci.h Sun Aug 31 07:52:15 2003 +++ edited/include/linux/pci.h Tue Sep 16 13:16:15 2003 @@ -628,7 +628,6 @@ #define HAVE_PCI_SET_MWI int pci_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); -int pci_generic_prep_mwi(struct pci_dev *dev); int pci_set_dma_mask(struct pci_dev *dev, u64 mask); int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask); int pci_assign_resource(struct pci_dev *dev, int i); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/