From: Adrian Bunk <bunk@stusta.de>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>,
James Bottomley <James.Bottomley@SteelEye.com>
Subject: [patch] 2.6.9-rc4: SCSI qla2xxx gcc 3.4 compile errors
Date: Mon, 11 Oct 2004 18:24:57 +0200 [thread overview]
Message-ID: <20041011162457.GA3485@stusta.de> (raw)
In-Reply-To: <Pine.LNX.4.58.0410102016180.3897@ppc970.osdl.org>
Compiling with gcc 3.4 results in the following compile errors:
<-- snip -->
CC drivers/scsi/qla2xxx/qla_os.o
drivers/scsi/qla2xxx/qla_os.c: In function `qla2x00_queuecommand':
drivers/scsi/qla2xxx/qla_os.c:315: sorry, unimplemented: inlining failed
in call to 'qla2x00_callback': function not considered for inlining
drivers/scsi/qla2xxx/qla_os.c:269: sorry, unimplemented: called from here
drivers/scsi/qla2xxx/qla_os.c:315: sorry, unimplemented: inlining failed
in call to 'qla2x00_callback': function not considered for inlining
drivers/scsi/qla2xxx/qla_os.c:269: sorry, unimplemented: called from here
make[3]: *** [drivers/scsi/qla2xxx/qla_os.o] Error 1
...
CC drivers/scsi/qla2xxx/qla_rscn.o
drivers/scsi/qla2xxx/qla_rscn.c: In function `qla2x00_cancel_io_descriptors':
drivers/scsi/qla2xxx/qla_rscn.c:320: sorry, unimplemented: inlining
failed in call to 'qla2x00_remove_iodesc_timer': function not considered for inlining
drivers/scsi/qla2xxx/qla_rscn.c:257: sorry, unimplemented: called from here
make[3]: *** [drivers/scsi/qla2xxx/qla_rscn.o] Error 1
<-- snip -->
Please apply my patch below which is already for some time in James'
SCSI tree.
diffstat output:
drivers/scsi/qla2xxx/qla_os.c | 122 ++++++++++++++++----------------
drivers/scsi/qla2xxx/qla_rscn.c | 28 +++----
2 files changed, 75 insertions(+), 75 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- a/drivers/scsi/qla2xxx/qla_os.c 2004-10-10 22:27:31 -07:00
+++ b/drivers/scsi/qla2xxx/qla_os.c 2004-10-10 22:27:31 -07:00
@@ -235,67 +236,6 @@
static __inline__ void
qla2x00_delete_from_done_queue(scsi_qla_host_t *, srb_t *);
-/**************************************************************************
-* sp_put
-*
-* Description:
-* Decrement reference count and call the callback if we're the last
-* owner of the specified sp. Will get the host_lock before calling
-* the callback.
-*
-* Input:
-* ha - pointer to the scsi_qla_host_t where the callback is to occur.
-* sp - pointer to srb_t structure to use.
-*
-* Returns:
-*
-**************************************************************************/
-static inline void
-sp_put(struct scsi_qla_host * ha, srb_t *sp)
-{
- if (atomic_read(&sp->ref_count) == 0) {
- qla_printk(KERN_INFO, ha,
- "%s(): **** SP->ref_count not zero\n",
- __func__);
- DEBUG2(BUG();)
-
- return;
- }
-
- if (!atomic_dec_and_test(&sp->ref_count)) {
- return;
- }
-
- qla2x00_callback(ha, sp->cmd);
-}
-
-/**************************************************************************
-* sp_get
-*
-* Description:
-* Increment reference count of the specified sp.
-*
-* Input:
-* sp - pointer to srb_t structure to use.
-*
-* Returns:
-*
-**************************************************************************/
-static inline void
-sp_get(struct scsi_qla_host * ha, srb_t *sp)
-{
- atomic_inc(&sp->ref_count);
-
- if (atomic_read(&sp->ref_count) > 2) {
- qla_printk(KERN_INFO, ha,
- "%s(): **** SP->ref_count greater than two\n",
- __func__);
- DEBUG2(BUG();)
-
- return;
- }
-}
-
/*
* qla2x00_callback
* Returns the completed SCSI command to LINUX.
@@ -366,6 +306,67 @@
(*(cmd)->scsi_done)(cmd);
}
+/**************************************************************************
+* sp_put
+*
+* Description:
+* Decrement reference count and call the callback if we're the last
+* owner of the specified sp. Will get the host_lock before calling
+* the callback.
+*
+* Input:
+* ha - pointer to the scsi_qla_host_t where the callback is to occur.
+* sp - pointer to srb_t structure to use.
+*
+* Returns:
+*
+**************************************************************************/
+static inline void
+sp_put(struct scsi_qla_host * ha, srb_t *sp)
+{
+ if (atomic_read(&sp->ref_count) == 0) {
+ qla_printk(KERN_INFO, ha,
+ "%s(): **** SP->ref_count not zero\n",
+ __func__);
+ DEBUG2(BUG();)
+
+ return;
+ }
+
+ if (!atomic_dec_and_test(&sp->ref_count)) {
+ return;
+ }
+
+ qla2x00_callback(ha, sp->cmd);
+}
+
+/**************************************************************************
+* sp_get
+*
+* Description:
+* Increment reference count of the specified sp.
+*
+* Input:
+* sp - pointer to srb_t structure to use.
+*
+* Returns:
+*
+**************************************************************************/
+static inline void
+sp_get(struct scsi_qla_host * ha, srb_t *sp)
+{
+ atomic_inc(&sp->ref_count);
+
+ if (atomic_read(&sp->ref_count) > 2) {
+ qla_printk(KERN_INFO, ha,
+ "%s(): **** SP->ref_count greater than two\n",
+ __func__);
+ DEBUG2(BUG();)
+
+ return;
+ }
+}
+
static inline void
qla2x00_delete_from_done_queue(scsi_qla_host_t *dest_ha, srb_t *sp)
{
--- a/drivers/scsi/qla2xxx/qla_rscn.c 2004-10-10 22:27:29 -07:00
+++ b/drivers/scsi/qla2xxx/qla_rscn.c 2004-10-10 22:27:29 -07:00
@@ -242,6 +242,20 @@
}
/**
+ * qla2x00_remove_iodesc_timer() - Remove an active timer from an IO descriptor.
+ * @iodesc: io descriptor
+ */
+static inline void
+qla2x00_remove_iodesc_timer(struct io_descriptor *iodesc)
+{
+ if (iodesc->timer.function != NULL) {
+ del_timer_sync(&iodesc->timer);
+ iodesc->timer.data = (unsigned long) NULL;
+ iodesc->timer.function = NULL;
+ }
+}
+
+/**
* qla2x00_init_io_descriptors() - Initialize the pool of IO descriptors.
* @ha: HA context
*/
@@ -309,20 +323,6 @@
iodesc->timer.function =
(void (*) (unsigned long)) qla2x00_iodesc_timeout;
add_timer(&iodesc->timer);
-}
-
-/**
- * qla2x00_remove_iodesc_timer() - Remove an active timer from an IO descriptor.
- * @iodesc: io descriptor
- */
-static inline void
-qla2x00_remove_iodesc_timer(struct io_descriptor *iodesc)
-{
- if (iodesc->timer.function != NULL) {
- del_timer_sync(&iodesc->timer);
- iodesc->timer.data = (unsigned long) NULL;
- iodesc->timer.function = NULL;
- }
}
/**
next prev parent reply other threads:[~2004-10-11 16:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-11 3:22 Linux 2.6.9-rc4 - pls test (and no more patches) Linus Torvalds
2004-10-11 7:07 ` Gene Heskett
2004-10-11 7:23 ` via-velocity heads up (was (Re: Linux 2.6.9-rc4 - pls test (and no more patches)) Francois Romieu
2004-10-11 13:32 ` Daniel Andersen
2004-10-11 16:53 ` Jerone Young
2004-10-11 9:07 ` Linux 2.6.9-rc4 - pls test (and no more patches) Brice Goglin
2004-10-11 14:57 ` Linus Torvalds
2004-10-11 20:22 ` Kjartan Maraas
2004-10-11 9:35 ` Andre Tomt
2004-10-11 15:02 ` Linus Torvalds
2004-10-11 15:09 ` James Bottomley
2004-10-11 18:22 ` Andre Tomt
2004-10-11 19:29 ` James Bottomley
2004-10-11 23:35 ` Linus Torvalds
2004-10-12 1:01 ` Lee Revell
2004-10-12 4:02 ` William Lee Irwin III
2004-10-12 6:57 ` Jesper Juhl
2004-10-11 21:37 ` Chris Ricker
2004-10-11 9:54 ` Nick Piggin
2004-10-11 15:17 ` Linus Torvalds
2004-10-11 15:25 ` Linus Torvalds
2004-10-12 0:11 ` Nick Piggin
2004-10-11 23:48 ` Nick Piggin
2004-10-12 6:00 ` Barry K. Nathan
2004-10-11 15:48 ` Linux 2.6.9-rc4 (compile stats) John Cherry
2004-10-11 15:51 ` John Cherry
2004-10-11 16:24 ` Adrian Bunk [this message]
2004-10-11 16:28 ` [patch] 2.6.9-rc4: SCSI qla2xxx gcc 3.4 compile errors James Bottomley
2004-10-11 16:35 ` Adrian Bunk
2004-10-11 17:05 ` James Bottomley
2004-10-11 22:04 ` Linux 2.6.9-rc4 - pls test (and no more patches) Tom Rini
2004-10-11 23:23 ` Tom Rini
2004-10-12 8:05 ` Matthias Andree
2004-10-12 9:09 ` [PATCH] tcp_output.c: tcp_set_skb_tso_factor ---> tcp_set_skb_tso_segs [Was: Re: Linux 2.6.9-rc4 - pls test (and no more patches)] Sami Farin
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=20041011162457.GA3485@stusta.de \
--to=bunk@stusta.de \
--cc=James.Bottomley@SteelEye.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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