From: Jiri Slaby <jslaby@suse.cz>
To: jbarnes@virtuousgeek.org
Cc: jirislaby@gmail.com, linux-kernel@vger.kernel.org,
Aristeu Sergio <arozansk@redhat.com>,
Mauro Carvalho Chehab <mchehab@redhat.com>,
linux-pci@vger.kernel.org, x86@kernel.org
Subject: [PATCH 2/2] X86: pci, fix section mismatches
Date: Mon, 30 Nov 2009 21:19:42 +0100 [thread overview]
Message-ID: <1259612382-32722-2-git-send-email-jslaby@suse.cz> (raw)
In-Reply-To: <1259612382-32722-1-git-send-email-jslaby@suse.cz>
pcibios_scan_specific_bus calls pci_scan_bus_on_node which is __devinit.
Mark it __devinit as well. All users are now __init or __devinit.
Remark update_res from __init to __devinit as it is called also from
__devinit functions.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Aristeu Sergio <arozansk@redhat.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: linux-pci@vger.kernel.org
Cc: x86@kernel.org
---
arch/x86/pci/amd_bus.c | 2 +-
arch/x86/pci/legacy.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index 995f360..b78ffff 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -119,7 +119,7 @@ static void __init update_range(struct res_range *range, size_t start,
}
}
-void __init update_res(struct pci_root_info *info, size_t start,
+void __devinit update_res(struct pci_root_info *info, size_t start,
size_t end, unsigned long flags, int merge)
{
int i;
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index a8194c8..8cf7835 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -39,7 +39,7 @@ static int __init pci_legacy_init(void)
return 0;
}
-void pcibios_scan_specific_bus(int busn)
+void __devinit pcibios_scan_specific_bus(int busn)
{
int devfn;
long node;
--
1.6.5.3
next prev parent reply other threads:[~2009-11-30 22:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-30 20:19 [PATCH 1/2] EDAC: add __init to i7core_xeon_pci_fixup Jiri Slaby
2009-11-30 20:19 ` Jiri Slaby [this message]
2009-12-04 23:54 ` [PATCH 2/2] X86: pci, fix section mismatches Jesse Barnes
2009-12-04 23:54 ` [PATCH 1/2] EDAC: add __init to i7core_xeon_pci_fixup Jesse Barnes
2009-12-05 13:55 ` Jiri Slaby
2009-12-08 0:44 ` Doug Thompson
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=1259612382-32722-2-git-send-email-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=arozansk@redhat.com \
--cc=jbarnes@virtuousgeek.org \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=x86@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®