Skip to contentSkip to conversation

FAILED: patch "[PATCH] base: arch_topology: fix section mismatch build warnings" failed to apply to 4.13-stable tree

PATCH [email protected] 1 participant 1 message Oct 10, 2017

Subsystems (3)
Stable branch Driver core Generic architecture topology
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.13-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 452562abb5b76c14449dead2a7113f641893e8bc Mon Sep 17 00:00:00 2001

From: Sudeep Holla <[email protected]>
Date: Thu, 7 Sep 2017 15:16:05 +0100
Subject: [PATCH] base: arch_topology: fix section mismatch build warnings

Commit 2ef7a2953c81 ("arm, arm64: factorize common cpu capacity default code") introduced init_cpu_capacity_callback and init_cpu_capacity_notifier which are referenced from initcall and are missing __init{,data} annotations resulting the below section mismatch build warnings.

"WARNING: vmlinux.o(.text+0xbab790): Section mismatch in reference from the function init_cpu_capacity_callback() to the variable .init.text:$x The function init_cpu_capacity_callback() references the variable __init $x. This is often because init_cpu_capacity_callback lacks a __init annotation or the annotation of $x is wrong."

This patch fixes the above build warnings by adding the required annotations.

Fixes 2ef7a2953c81 ("arm, arm64: factorize common cpu capacity default code")
Cc Juri Lelli <[email protected]>
Cc stable <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/base/arch_topology.c +6 -6
index 41be9ff7d70a..6df7d6676a48 100644
@@ -166,11 +166,11 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
 }
 
 #ifdef CONFIG_CPU_FREQ
-static cpumask_var_t cpus_to_visit;
-static void parsing_done_workfn(struct work_struct *work);
-static DECLARE_WORK(parsing_done_work, parsing_done_workfn);
+static cpumask_var_t cpus_to_visit __initdata;
+static void __init parsing_done_workfn(struct work_struct *work);
+static __initdata DECLARE_WORK(parsing_done_work, parsing_done_workfn);
 
-static int
+static int __init
 init_cpu_capacity_callback(struct notifier_block *nb,
 			   unsigned long val,
 			   void *data)

@@ -206,7 +206,7 @@ init_cpu_capacity_callback(struct notifier_block *nb,
 	return 0;
 }
 
-static struct notifier_block init_cpu_capacity_notifier = {
+static struct notifier_block init_cpu_capacity_notifier __initdata = {
 	.notifier_call = init_cpu_capacity_callback,
 };
 

@@ -232,7 +232,7 @@ static int __init register_cpufreq_notifier(void)
 }
 core_initcall(register_cpufreq_notifier);
 
-static void parsing_done_workfn(struct work_struct *work)
+static void __init parsing_done_workfn(struct work_struct *work)
 {
 	cpufreq_unregister_notifier(&init_cpu_capacity_notifier,
 					 CPUFREQ_POLICY_NOTIFIER);