public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Erik Andersen <andersen@codepoet.org>
To: Ben Collins <bcollins@debian.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] fix 2.4.19-pre6 + 1394 compile failure
Date: Sun, 7 Apr 2002 03:43:51 -0600	[thread overview]
Message-ID: <20020407094351.GA11303@codepoet.org> (raw)


With 2.4.19-pre6:
    CONFIG_IEEE1394=y
    CONFIG_IEEE1394_PCILYNX=y
    CONFIG_IEEE1394_OHCI1394=y
    CONFIG_IEEE1394_SBP2=m

results in 

drivers/ieee1394/ieee1394drv.o: In function `ohci1394_pci_probe':
drivers/ieee1394/ieee1394drv.o(.text.init+0xa37): undefined reference to `local symbols in discarded section .text.exit'
drivers/ieee1394/ieee1394drv.o(.text.init+0xcda): undefined reference to `local symbols in discarded section .text.exit'
make: *** [vmlinux] Error 1

ohci1394_pci_probe() calls ohci1394_pci_remove() via the FAIL
macro, but ohci1394_pci_remove() is marked __devexit and thus
gets tossed at link time.  Seems it needs to stick around.


--- linux/drivers/ieee1394/ohci1394.c~	Sun Apr  7 03:41:39 2002
+++ linux/drivers/ieee1394/ohci1394.c	Sun Apr  7 03:41:50 2002
@@ -171,7 +171,7 @@
 static void dma_trm_tasklet(unsigned long data);
 static void dma_trm_reset(struct dma_trm_ctx *d);
 
-static void __devexit ohci1394_pci_remove(struct pci_dev *pdev);
+static void ohci1394_pci_remove(struct pci_dev *pdev);
 
 static inline void ohci1394_run_irq_hooks(struct ti_ohci *ohci,
 					  quadlet_t isoRecvEvent, 
@@ -2209,7 +2209,7 @@
 #undef FAIL
 }
 
-static void __devexit ohci1394_pci_remove(struct pci_dev *pdev)
+static void ohci1394_pci_remove(struct pci_dev *pdev)
 {
 	struct ti_ohci *ohci;
 	quadlet_t buf;
@@ -2314,7 +2314,7 @@
 	name:		OHCI1394_DRIVER_NAME,
 	id_table:	ohci1394_pci_tbl,
 	probe:		ohci1394_pci_probe,
-	remove:		__devexit_p(ohci1394_pci_remove),
+	remove:		ohci1394_pci_remove,
 };
 

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--

                 reply	other threads:[~2002-04-07  9:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20020407094351.GA11303@codepoet.org \
    --to=andersen@codepoet.org \
    --cc=bcollins@debian.org \
    --cc=linux-kernel@vger.kernel.org \
    /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