From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com.br>
Cc: jgarzik@redhat.com, linux-kernel@vger.kernel.org
Subject: [PATCH] 2.4 fix pci_generic_prep_mwi export breakage
Date: Wed, 17 Sep 2003 10:38:48 -0600 [thread overview]
Message-ID: <200309171038.48602.bjorn.helgaas@hp.com> (raw)
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);
next reply other threads:[~2003-09-17 16:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-09-17 16:38 Bjorn Helgaas [this message]
2003-09-20 18:24 ` Jeff Garzik
2003-09-21 18:28 ` Marcelo Tosatti
2003-09-22 16:07 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200309171038.48602.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp.com \
--cc=jgarzik@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo.tosatti@cyclades.com.br \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®