From: "Jan Beulich" <JBeulich@novell.com>
To: "Jesse Barnes" <jesse.barnes@intel.com>,
"Yinghai Lu" <yinghai@kernel.org>
Cc: <mingo@elte.hu>, <tglx@linutronix.de>, <arozansk@redhat.com>,
<mchehab@redhat.com>, "Michal Marek" <mmarek@suse.cz>,
<linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<hpa@zytor.com>
Subject: Re: [PATCH, resend] x86/PCI: don't export a __devinit function
Date: Fri, 18 Feb 2011 09:07:55 +0000 [thread overview]
Message-ID: <4D5E44FB0200007800032A2F@vpn.id2.novell.com> (raw)
In-Reply-To: <AANLkTik8B_evoOh_B9=2w=5nDAheZZiZLWyLGHavPy1c@mail.gmail.com>
>>> On 17.02.11 at 18:21, Yinghai Lu <yinghai@kernel.org> wrote:
> On Thu, Feb 17, 2011 at 8:08 AM, Jan Beulich <JBeulich@novell.com> wrote:
>> Exporting a __devinit function (pcibios_scan_specific_bus()) isn't
>> correct. (Michal, any reason why modpost only warns about exported
>> __init functions?) Short of being able to think of a better solution,
>> and short of making the whole call tree (reaching into the arch-
>> independent part of the PCI subsystem) non-__devinit, export the
>> symbol only when HOTPLUG is enabled (which is always the case for non-
>> expert configurations), use section mismatch avoidance annotations for
>> that case (knowing that __devinit functions will not be discarded),
>> and mark the symbol __devinit only in the !HOTPLUG case.
>>
>> Consequently, EDAC_I7CORE (consuming the export) then has to depend on
>> HOTPLUG. A fundamental question of course if whether this driver has
>> to use that function in the first place (i.e. whether it wouldn't be
>> better to just remove the export) - the problem it tries to address
>> happens on other systems too, but the PCI bus the devices in question
>> live on isn't necessarily bus 255. For the affected system I have, the
>> alternative approach is to set pcibios_last_bus from __pci_mmcfg_init()
>> based on the highest bus number on segment 0 being covered by MCFG.
>>
>> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>> Cc: Aristeu Sergio <arozansk@redhat.com>
>> Cc: Michal Marek <mmarek@suse.cz>
>>
>> ---
>> arch/x86/pci/legacy.c | 21 ++++++++++++++++++---
>> drivers/edac/Kconfig | 2 +-
>> 2 files changed, 19 insertions(+), 4 deletions(-)
>>
>> --- 2.6.38-rc5/arch/x86/pci/legacy.c
>> +++ 2.6.38-rc5-x86-pci-section-conflict/arch/x86/pci/legacy.c
>> @@ -36,7 +36,23 @@ int __init pci_legacy_init(void)
>> return 0;
>> }
>>
>> -void __devinit pcibios_scan_specific_bus(int busn)
>> +#ifdef CONFIG_HOTPLUG
>> +static void __ref
>> +#else
>> +static inline void
>> +#endif
>> +_pci_scan_bus_on_node(int busno, int node)
>> +{
>> + pci_scan_bus_on_node(busno, &pci_root_ops, node);
>> +}
>> +
>> +#ifdef CONFIG_HOTPLUG
>> +EXPORT_SYMBOL_GPL(pcibios_scan_specific_bus);
>> +void
>> +#else
>> +void __devinit
>> +#endif
>
> anyway to avoid or reduce those #ifdef?
Yes, they look ugly, but no, I have no better idea (other than
creating single-use abstractions that wouldn't look any better).
Jan
next prev parent reply other threads:[~2011-02-18 9:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 16:08 Jan Beulich
2011-02-17 17:21 ` Yinghai Lu
2011-02-18 9:07 ` Jan Beulich [this message]
2011-02-17 18:12 ` Mauro Carvalho Chehab
2011-02-17 23:12 ` Yinghai Lu
2011-02-18 0:12 ` Mauro Carvalho Chehab
2011-02-18 9:12 ` Jan Beulich
2011-02-22 23:25 ` Jesse Barnes
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=4D5E44FB0200007800032A2F@vpn.id2.novell.com \
--to=jbeulich@novell.com \
--cc=arozansk@redhat.com \
--cc=hpa@zytor.com \
--cc=jesse.barnes@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=mingo@elte.hu \
--cc=mmarek@suse.cz \
--cc=tglx@linutronix.de \
--cc=yinghai@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
all inboxes | Powered by JetHome®