Skip to contentSkip to conversation

linux-next: pci tree build warning

PATCH Applied Stephen Rothwell 4 participants 4 messages Oct 8, 2009 – Oct 26, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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").

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#1 lore raw

PATCH 1/1 pci: pci_dfl_cache_line_size is __devinitdata

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

---
 drivers/pci/pci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.c +1 -1
index 1ae95df..a6e22fd 100644
@@ -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;
 
 /**
#2 lore raw

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

Quoted 15 lines · On Thu, 08 Oct 2009 18:59:53 +0900 Tejun Heo <[email protected]> wrote:

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

---
 drivers/pci/pci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.c +0 -0
index 1ae95df..a6e22fd 100644

drivers/pci/pci.c unsigned long pci_hotplug_mem_size = · line 58

Quoted 7 lines
drivers/pci/pci.c +1 -1
@@ -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.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Applied
#3 lore raw

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

In reply to Tejun Heo
Quoted 7 lines · On Thu, 08 Oct 2009 18:59:53 +0900 Tejun Heo <[email protected]> wrote:

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

---

Applied to my linux-next tree, thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center