OMAP: Section mismatch warning fixes

Tony,

Below are couple of section mismatch warning fixes for v3.3-rc5

Santosh Shilimkar (2):
ARM: OMAP: fix section mismatch warning for omap4_hotplug_cpu()
ARM: OMAP: Fix section mismatch warning for platform_cpu_die()

 arch/arm/mach-omap2/omap-hotplug.c        |    2 +-
 arch/arm/mach-omap2/omap-mpuss-lowpower.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

1.7.4.1

WARNING: arch/arm/mach-omap2/built-in.o(.text+0x8b80):
Section mismatch in reference from the function omap4_hotplug_cpu() to the function .cpuinit.text:omap_secondary_startup()
The function omap4_hotplug_cpu() references
the function __cpuinit omap_secondary_startup().
This is often because omap4_hotplug_cpu lacks a __cpuinit annotation or the annotation of omap_secondary_startup is wrong.

---
 arch/arm/mach-omap2/omap-mpuss-lowpower.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 1d5d010..fe9ab7c 100644
@@ -300,7 +300,7 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
  * @cpu : CPU ID
  * @power_state: CPU low power state.
  */
-int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
+int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
 {
 	unsigned int cpu_state = 0;
 

1.7.4.1

WARNING: vmlinux.o(.text+0x226d0):
Section mismatch in reference from the function platform_cpu_die() to the function .cpuinit.text:omap4_hotplug_cpu() The function platform_cpu_die() references
the function __cpuinit omap4_hotplug_cpu().
This is often because platform_cpu_die lacks a __cpuinit annotation or the annotation of omap4_hotplug_cpu is wrong.

Thanks to Russell King for suggesting __ref annotation trick just like it's parent function for this warning becasue __cupinit usage was definitely wrong to fix this warning..

---
 arch/arm/mach-omap2/omap-hotplug.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index adbe4d8..56c345b 100644
@@ -33,7 +33,7 @@ int platform_cpu_kill(unsigned int cpu)
  * platform-specific code to shutdown a CPU
  * Called with IRQs disabled
  */
-void platform_cpu_die(unsigned int cpu)
+void __ref platform_cpu_die(unsigned int cpu)
 {
 	unsigned int this_cpu;
 

1.7.4.1

Hello,

s/it's/its/; s/becasue/because/; s/cup/cpu/

Having said that I think the grammar is broken, too. Maybe:

Thanks to Russell King for suggesting to use __ref instead of the initial (and wrong) approach to use __cpuinit.

(But note I'm not a native speaker, too)

Uwe

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

2012/2/23 Uwe Kleine-K?nig <[email protected]>:

Thanks for fixing the grammar. :)
Updated patch below with comments corrected as per your suggestion.

Regards
Santosh

From: Santosh Shilimkar <[email protected]>
Date: Wed, 22 Feb 2012 16:10:04 +0530
Subject: [PATCH 2/2] ARM: OMAP: Fix section mismatch warning for platform_cpu_die()

WARNING: vmlinux.o(.text+0x226d0):
Section mismatch in reference from the function platform_cpu_die() to the function .cpuinit.text:omap4_hotplug_cpu() The function platform_cpu_die() references
the function __cpuinit omap4_hotplug_cpu().
This is often because platform_cpu_die lacks a __cpuinit annotation or the annotation of omap4_hotplug_cpu is wrong.

Thanks to Russell King for suggesting to use __ref instead of the initial (and wrong) approach to use __cpuinit.

---
 arch/arm/mach-omap2/omap-hotplug.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

b/arch/arm/mach-omap2/omap-hotplug.c
index adbe4d8..56c345b 100644

@@ -33,7 +33,7 @@ int platform_cpu_kill(unsigned int cpu)
  * platform-specific code to shutdown a CPU
  * Called with IRQs disabled
  */
-void platform_cpu_die(unsigned int cpu)
+void __ref platform_cpu_die(unsigned int cpu)
 {
 	unsigned int this_cpu;
 

1.7.4.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-ARM-OMAP-Fix-section-mismatch-warning-for-platform_c.patch
Type: application/octet-stream
Size: 1343 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120223/148fa317/attachment.obj>

Thanks applying both into fixes-non-critical.

Regards,

Tony