linux-next: pci tree build warning

linux-next: pci tree build warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 681 bytes --]

Hi Jesse,

Today's linux-next build (powerpc allnoconfig) produced this warning:

WARNING: drivers/pci/built-in.o(.devinit.text+0x86a): Section mismatch in reference from the function pci_init() to the variable .init.data:pci_dfl_cache_line_size
The function __devinit pci_init() references
a variable __initdata pci_dfl_cache_line_size.
If pci_dfl_cache_line_size is only used by pci_init then
annotate pci_dfl_cache_line_size with a matching annotation.

Introduced by commit b20dd110d21aac94b3f4063cffbcf9718656ce51 ("PCI:
determine CLS more intelligently").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

[PATCH pci-2.6#linux-next] pci: pci_dfl_cache_line_size is __devinitdata

[Tejun Heo]

pci_dfl_cache_line_size is marked as __initdata but referenced by
pci_init() which is __devinit.  Make it __devinitdata instead of
__initdata.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pci/pci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1ae95df..a6e22fd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -53,7 +53,7 @@ unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE;
  * the dfl or actual value as it sees fit.  Don't forget this is
  * measured in 32-bit words, not bytes.
  */
-u8 pci_dfl_cache_line_size __initdata = L1_CACHE_BYTES >> 2;
+u8 pci_dfl_cache_line_size __devinitdata = L1_CACHE_BYTES >> 2;
 u8 pci_cache_line_size;
 
 /**

Re: [PATCH pci-2.6#linux-next] pci: pci_dfl_cache_line_size is __devinitdata

[Jesse Barnes]

On Thu, 08 Oct 2009 18:59:53 +0900
Tejun Heo <tj@kernel.org> wrote:

> pci_dfl_cache_line_size is marked as __initdata but referenced by
> pci_init() which is __devinit.  Make it __devinitdata instead of
> __initdata.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pci/pci.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 1ae95df..a6e22fd 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -53,7 +53,7 @@ unsigned long pci_hotplug_mem_size =
> DEFAULT_HOTPLUG_MEM_SIZE;
>   * the dfl or actual value as it sees fit.  Don't forget this is
>   * measured in 32-bit words, not bytes.
>   */
> -u8 pci_dfl_cache_line_size __initdata = L1_CACHE_BYTES >> 2;
> +u8 pci_dfl_cache_line_size __devinitdata = L1_CACHE_BYTES >> 2;
>  u8 pci_cache_line_size;

Fix pushed, thanks for the quick turnaround Tejun.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH pci-2.6#linux-next] pci: pci_dfl_cache_line_size is __devinitdata

[Jesse Barnes]

On Thu, 08 Oct 2009 18:59:53 +0900
Tejun Heo <tj@kernel.org> wrote:

> pci_dfl_cache_line_size is marked as __initdata but referenced by
> pci_init() which is __devinit.  Make it __devinitdata instead of
> __initdata.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---

Applied to my linux-next tree, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center