summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-01-25 14:14:20 +0000
committerOlof Johansson <olof@lixom.net>2013-02-11 17:42:28 -0800
commit389d2111f43ca8cd5344b6ba9ab7bd5902bdd5f0 (patch)
treea78f020263af465eae7857a02f1e14d694ae3b7d
parent41fd91b4df9e9779943a98f1baac8ac7e18aa4a4 (diff)
ARM: msm: proc_comm_boot_wait should not be __init
msm_smd_probe is a driver probe function and may get called after the __init time, so it must not call any __init function, as the link-time warning reports. Take away the __init annotation on proc_comm_boot_wait to fix this. Without this patch, building msm_defconfig results in: WARNING: vmlinux.o(.text+0xb048): Section mismatch in reference from the function msm_smd_probe() to the function .init.text:proc_comm_boot_wait() The function msm_smd_probe() references the function __init proc_comm_boot_wait(). This is often because msm_smd_probe lacks a __init annotation or the annotation of proc_comm_boot_wait is wrong. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Bryan Huntsman <bryanh@codeaurora.org> Cc: Daniel Walker <c_dwalke@quicinc.com> Cc: linux-arm-msm@vger.kernel.org Acked-by: David Brown <davidb@codeaurora.org> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-msm/proc_comm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/proc_comm.h b/arch/arm/mach-msm/proc_comm.h
index 12da4cacd4a8..e8d043a0e990 100644
--- a/arch/arm/mach-msm/proc_comm.h
+++ b/arch/arm/mach-msm/proc_comm.h
@@ -253,6 +253,6 @@ enum {
(((drvstr) & 0xF) << 17))
int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2);
-void __init proc_comm_boot_wait(void);
+void proc_comm_boot_wait(void);
#endif