From: Roland Dreier <rdreier@cisco.com>
To: Ingo Molnar <mingo@elte.hu>,
Ralph Campbell <ralph.campbell@qlogic.com>,
Dave Olson <dave.olson@qlogic.com>
Cc: akpm@linux-foundation.org, torvalds@linux-foundation.org,
linux-kernel@vger.kernel.org, general@lists.openfabrics.org
Subject: Re: [ofa-general] Re: [GIT PULL] please pull infiniband.git
Date: Sat, 19 Apr 2008 07:11:20 -0700 [thread overview]
Message-ID: <adaod86aq9j.fsf@cisco.com> (raw)
In-Reply-To: <20080419081614.GA2437@elte.hu> (Ingo Molnar's message of "Sat, 19 Apr 2008 10:16:14 +0200")
> x86.git auto-testing found that these changes broke the -git build, with
> this config:
>
> http://redhat.com/~mingo/misc/config-Sat_Apr_19_09_55_05_CEST_2008.bad
>
> the failure is a link failure:
>
> drivers/built-in.o: In function `ipath_init_one':
> ipath_driver.c:(.devinit.text+0x1e5bc): undefined reference to `ipath_init_iba7220_funcs'
Thanks. The relevant parts of the config are
# CONFIG_PCI_MSI is not set
CONFIG_HT_IRQ=y
CONFIG_INFINIBAND_IPATH=y
The problem is that the iba7220 files don't get built in that case, but
the main driver file tries to call ipath_init_iba7220 anyway.
This is fixed by the patch below, which makes the iba7220 file build
unconditionally.
I also removed the dependency on HT_IRQ || PCI_MSI in the Kconfig, since
the iba7220 support should work without it. I know we discussed this
before, but looking closer at the code, the dependency seems pointless
to me, since it's still possible to build a driver that doesn't work if
a particular system needs, say HT_IRQ, and the user selects PCI_MSI.
And since iba7220 doesn't need either, we might as well let people build
that.
If this is OK with everyone, I will merge this with a proper changelog.
- R.
diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/infiniband/hw/ipath/Kconfig
index 044da58..3c7968f 100644
--- a/drivers/infiniband/hw/ipath/Kconfig
+++ b/drivers/infiniband/hw/ipath/Kconfig
@@ -1,6 +1,6 @@
config INFINIBAND_IPATH
tristate "QLogic InfiniPath Driver"
- depends on (PCI_MSI || HT_IRQ) && 64BIT && NET
+ depends on 64BIT && NET
---help---
This is a driver for QLogic InfiniPath host channel adapters,
including InfiniBand verbs support. This driver allows these
diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile
index 75a6c91..bf94500 100644
--- a/drivers/infiniband/hw/ipath/Makefile
+++ b/drivers/infiniband/hw/ipath/Makefile
@@ -29,11 +29,13 @@ ib_ipath-y := \
ipath_user_pages.o \
ipath_user_sdma.o \
ipath_verbs_mcast.o \
- ipath_verbs.o
+ ipath_verbs.o \
+ ipath_iba7220.o \
+ ipath_sd7220.o \
+ ipath_sd7220_img.o
ib_ipath-$(CONFIG_HT_IRQ) += ipath_iba6110.o
ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba6120.o
-ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba7220.o ipath_sd7220.o ipath_sd7220_img.o
ib_ipath-$(CONFIG_X86_64) += ipath_wc_x86_64.o
ib_ipath-$(CONFIG_PPC64) += ipath_wc_ppc64.o
next prev parent reply other threads:[~2008-04-19 14:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-17 14:53 [GIT PULL] please pull infiniband.git Roland Dreier
2008-04-19 8:16 ` Ingo Molnar
2008-04-19 14:11 ` Roland Dreier [this message]
2008-04-19 14:18 ` [ofa-general] " Roland Dreier
2008-04-19 15:20 ` Dave Olson
2008-04-19 16:12 ` Roland Dreier
2008-04-20 14:47 ` Dave Olson
2008-04-21 1:55 ` Roland Dreier
2008-04-21 2:35 ` Dave Olson
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=adaod86aq9j.fsf@cisco.com \
--to=rdreier@cisco.com \
--cc=akpm@linux-foundation.org \
--cc=dave.olson@qlogic.com \
--cc=general@lists.openfabrics.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=ralph.campbell@qlogic.com \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).