2009-12-15 01:20:12

by Hidetoshi Seto

Subject: [PATCH] pci: fix section mismatch on update_res()

From: Jiri Slaby <[email protected]>

Remark update_res from __init to __devinit as it is called also
from __devinit functions.

This patch removes the following warning message:

WARNING: vmlinux.o(.devinit.text+0x774a): Section mismatch
in reference from the function pci_root_bus_res() to the
function .init.text:update_res()
The function __devinit pci_root_bus_res() references
a function __init update_res().
If update_res is only used by pci_root_bus_res then
annotate update_res with a matching annotation.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Aristeu Sergio <[email protected]>
Cc: Jesse Barnes <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Hidetoshi Seto <[email protected]>
---
arch/x86/pci/bus_numa.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c
index 145df00..f939d60 100644
--- a/arch/x86/pci/bus_numa.c
+++ b/arch/x86/pci/bus_numa.c
@@ -51,7 +51,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b)
}
}

-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;
--
1.6.5.6

2009-12-16 19:31:14

by Jesse Barnes

Subject: Re: [PATCH] pci: fix section mismatch on update_res()

On Tue, 15 Dec 2009 10:19:50 +0900
Hidetoshi Seto <[email protected]> wrote:

> From: Jiri Slaby <[email protected]>
>
> Remark update_res from __init to __devinit as it is called also
> from __devinit functions.
>
> This patch removes the following warning message:
>
> WARNING: vmlinux.o(.devinit.text+0x774a): Section mismatch
> in reference from the function pci_root_bus_res() to the
> function .init.text:update_res()
> The function __devinit pci_root_bus_res() references
> a function __init update_res().
> If update_res is only used by pci_root_bus_res then
> annotate update_res with a matching annotation.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Aristeu Sergio <[email protected]>
> Cc: Jesse Barnes <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Hidetoshi Seto <[email protected]>
> ---
> arch/x86/pci/bus_numa.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c
> index 145df00..f939d60 100644
> --- a/arch/x86/pci/bus_numa.c
> +++ b/arch/x86/pci/bus_numa.c
> @@ -51,7 +51,7 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b)
> }
> }
>
> -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;

Applied, thanks Hidetoshi-san and Jiri.

--
Jesse Barnes, Intel Open Source Technology Center