[PATCH] ia64-acpi section mismatch

[PATCH] ia64-acpi section mismatch

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

On 2.6.22-rc2-git5:
WARNING: arch/ia64/kernel/built-in.o(.text+0x12): Section mismatch: reference to .init.text:acpi_find_rsdp (between 'acpi_get_sysname' and 'acpi_request_vector')

Looks like acpi_get_sysname() can be marked __init...

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 arch/ia64/kernel/acpi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2622-rc2g5.orig/arch/ia64/kernel/acpi.c
+++ linux-2622-rc2g5/arch/ia64/kernel/acpi.c
@@ -67,7 +67,7 @@ EXPORT_SYMBOL(pm_power_off);
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
 
-const char *acpi_get_sysname(void)
+const char * __init acpi_get_sysname(void)
 {
 #ifdef CONFIG_IA64_GENERIC
 	unsigned long rsdp_phys;

RE: [PATCH] ia64-acpi section mismatch

[Luck, Tony]

> Looks like acpi_get_sysname() can be marked __init...

Agreed ... in fact I checked that into my local tree about
20 minutes ago.  Haven't pushed it out yet.

The "Section mismatch" whack-a-mole game is almost over.  With this
change applied the only one I have left is:

Section mismatch: reference to .init.text:acpi_map_pxm_to_node (between 'acpi_get_node' and 'acpi_lock_ac_dir')


for which the answer *appears* to be to drop the __cpuinit attribute
on acpi_map_pxm_to_node()

-Tony

[PATCH] Section mismatch ... acpi_map_pxm_to_node

[Luck, Tony]

Last of the "Section mismatch" errors from ia64 builds! acpi_map_pxm_to_node()
is defined with attribute __cpuinit, but is called by "normal" kernel functions
acpi_getnode() and acpi_map_cpu2node().

Commit f363d16fbb9374c0bd7f2757d412c287169094c9 moved the data structures on
which this routine operates from __cpuinitdata to regular memory, so this
routine can also move out of init space.

Signed-off-by: Tony Luck <tony.luck@intel.com>

---

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index a2efae8..0c9f15c 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -59,7 +59,7 @@ int node_to_pxm(int node)
 	return node_to_pxm_map[node];
 }
 
-int __cpuinit acpi_map_pxm_to_node(int pxm)
+int acpi_map_pxm_to_node(int pxm)
 {
 	int node = pxm_to_node_map[pxm];
 
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
index b62cd36..e2fcee2 100644
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
@@ -13,7 +13,7 @@
 
 extern int pxm_to_node(int);
 extern int node_to_pxm(int);
-extern int __cpuinit acpi_map_pxm_to_node(int);
+extern int acpi_map_pxm_to_node(int);
 extern void __cpuinit acpi_unmap_pxm_to_node(int);
 
 #endif				/* CONFIG_ACPI_NUMA */

[PATCH] Section mismatch ... acpi_map_pxm_to_node

[Luck, Tony]

Last of the "Section mismatch" errors from ia64 builds! acpi_map_pxm_to_node()
is defined with attribute __cpuinit, but is called by "normal" kernel functions
acpi_getnode() and acpi_map_cpu2node().

Commit f363d16fbb9374c0bd7f2757d412c287169094c9 moved the data structures on
which this routine operates from __cpuinitdata to regular memory, so this
routine can also move out of init space.

Signed-off-by: Tony Luck <tony.luck@intel.com>

---

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index a2efae8..0c9f15c 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -59,7 +59,7 @@ int node_to_pxm(int node)
 	return node_to_pxm_map[node];
 }
 
-int __cpuinit acpi_map_pxm_to_node(int pxm)
+int acpi_map_pxm_to_node(int pxm)
 {
 	int node = pxm_to_node_map[pxm];
 
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
index b62cd36..e2fcee2 100644
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
@@ -13,7 +13,7 @@
 
 extern int pxm_to_node(int);
 extern int node_to_pxm(int);
-extern int __cpuinit acpi_map_pxm_to_node(int);
+extern int acpi_map_pxm_to_node(int);
 extern void __cpuinit acpi_unmap_pxm_to_node(int);
 
 #endif				/* CONFIG_ACPI_NUMA */

Re: [PATCH] Section mismatch ... acpi_map_pxm_to_node

[Len Brown]

Applied.

thanks,
-Len

On Thursday 24 May 2007 16:57, Luck, Tony wrote:
> Last of the "Section mismatch" errors from ia64 builds! acpi_map_pxm_to_node()
> is defined with attribute __cpuinit, but is called by "normal" kernel functions
> acpi_getnode() and acpi_map_cpu2node().
> 
> Commit f363d16fbb9374c0bd7f2757d412c287169094c9 moved the data structures on
> which this routine operates from __cpuinitdata to regular memory, so this
> routine can also move out of init space.
> 
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> 
> ---
> 
> diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
> index a2efae8..0c9f15c 100644
> --- a/drivers/acpi/numa.c
> +++ b/drivers/acpi/numa.c
> @@ -59,7 +59,7 @@ int node_to_pxm(int node)
>  	return node_to_pxm_map[node];
>  }
>  
> -int __cpuinit acpi_map_pxm_to_node(int pxm)
> +int acpi_map_pxm_to_node(int pxm)
>  {
>  	int node = pxm_to_node_map[pxm];
>  
> diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
> index b62cd36..e2fcee2 100644
> --- a/include/acpi/acpi_numa.h
> +++ b/include/acpi/acpi_numa.h
> @@ -13,7 +13,7 @@
>  
>  extern int pxm_to_node(int);
>  extern int node_to_pxm(int);
> -extern int __cpuinit acpi_map_pxm_to_node(int);
> +extern int acpi_map_pxm_to_node(int);
>  extern void __cpuinit acpi_unmap_pxm_to_node(int);
>  
>  #endif				/* CONFIG_ACPI_NUMA */
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] Section mismatch ... acpi_map_pxm_to_node

[Len Brown]

Applied.

thanks,
-Len

On Thursday 24 May 2007 16:57, Luck, Tony wrote:
> Last of the "Section mismatch" errors from ia64 builds! acpi_map_pxm_to_node()
> is defined with attribute __cpuinit, but is called by "normal" kernel functions
> acpi_getnode() and acpi_map_cpu2node().
> 
> Commit f363d16fbb9374c0bd7f2757d412c287169094c9 moved the data structures on
> which this routine operates from __cpuinitdata to regular memory, so this
> routine can also move out of init space.
> 
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> 
> ---
> 
> diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
> index a2efae8..0c9f15c 100644
> --- a/drivers/acpi/numa.c
> +++ b/drivers/acpi/numa.c
> @@ -59,7 +59,7 @@ int node_to_pxm(int node)
>  	return node_to_pxm_map[node];
>  }
>  
> -int __cpuinit acpi_map_pxm_to_node(int pxm)
> +int acpi_map_pxm_to_node(int pxm)
>  {
>  	int node = pxm_to_node_map[pxm];
>  
> diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
> index b62cd36..e2fcee2 100644
> --- a/include/acpi/acpi_numa.h
> +++ b/include/acpi/acpi_numa.h
> @@ -13,7 +13,7 @@
>  
>  extern int pxm_to_node(int);
>  extern int node_to_pxm(int);
> -extern int __cpuinit acpi_map_pxm_to_node(int);
> +extern int acpi_map_pxm_to_node(int);
>  extern void __cpuinit acpi_unmap_pxm_to_node(int);
>  
>  #endif				/* CONFIG_ACPI_NUMA */
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] ia64-acpi section mismatch

[Horms]

On Thu, May 24, 2007 at 11:22:10AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> On 2.6.22-rc2-git5:
> WARNING: arch/ia64/kernel/built-in.o(.text+0x12): Section mismatch: reference to .init.text:acpi_find_rsdp (between 'acpi_get_sysname' and 'acpi_request_vector')
> 
> Looks like acpi_get_sysname() can be marked __init...

It seems like Tony has put the same fix in.
In any case, no warnings over here on
Linus' 1c1ee4c3e7e16d23166a624a132889df3c540a18

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/