Linux SCSI subsystem development
 help / color / mirror / Atom feed
From: "Tom 'spot' Callaway" <tcallawa@redhat.com>
To: linux-scsi@vger.kernel.org, sparclinux@vger.kernel.org
Cc: davem@davemloft.net
Subject: [PATCH] Build mptspi.c on architectures where CONFIG_PM is unset
Date: Sat, 03 Jun 2006 09:36:47 -0500	[thread overview]
Message-ID: <1149345407.14611.49.camel@localhost.localdomain> (raw)

When trying to build mpt* for sparc64 (my T2000 needs mptsas and
friends), I noticed that mptspi.o was not building:

  CC [M]  drivers/message/fusion/mptspi.o
drivers/message/fusion/mptspi.c: In function `mptspi_resume':
drivers/message/fusion/mptspi.c:844: error: implicit declaration of
function `mptscsih_resume'
drivers/message/fusion/mptspi.c: At top level:
drivers/message/fusion/mptspi.c:839: warning: 'mptspi_resume' defined
but not used
make[3]: *** [drivers/message/fusion/mptspi.o] Error 1
make[2]: *** [drivers/message/fusion] Error 2
make[1]: *** [drivers/message] Error 2

sparc64 does not have CONFIG_PM defined, and mptscsih_resume is wrapped
in an #ifdef CONFIG_PM in mptscsih.h. mptscsih_resume is only used in
the mptspi_resume function in mptspi.c, and its only call is in the
pci_driver struct (and that call is also #ifdef CONFIG_PM). In order to
get the code to compile, I just needed to wrap the actual function in
#ifdef CONFIG_PM, which is what this patch does. I can confirm that it
gets the module building again without errors.

Signed-off-by: Tom "spot" Callaway <tcallawa@redhat.com>

--- linux-2.6.16-sparc64/drivers/message/fusion/mptspi.c.BAD
+++ linux-2.6.16-sparc64/drivers/message/fusion/mptspi.c
@@ -831,6 +831,7 @@
 	return rc;
 }
 
+#ifdef CONFIG_PM
 /*
  * spi module resume handler
  */
@@ -846,6 +847,7 @@
 
 	return rc;
 }
+#endif
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

~spot
-- 
Tom "spot" Callaway: Red Hat Senior Sales Engineer || GPG ID: 93054260
Fedora Extras Steering Committee Member (RPM Standards and Practices)
Aurora Linux Project Leader: http://auroralinux.org
Lemurs, llamas, and sparcs, oh my!


             reply	other threads:[~2006-06-03 14:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-06-03 14:36 Tom 'spot' Callaway [this message]
2006-06-10  0:00 ` [PATCH] Build mptspi.c on architectures where CONFIG_PM is unset David Miller
  -- strict thread matches above, loose matches on Subject: below --
2006-06-14 23:16 Moore, Eric
2006-06-14 23:47 ` David Miller

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=1149345407.14611.49.camel@localhost.localdomain \
    --to=tcallawa@redhat.com \
    --cc=davem@davemloft.net \
    --cc=linux-scsi@vger.kernel.org \
    --cc=sparclinux@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