Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bbaeca7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "base: arch_topology: fix section mismatch build warnings"" into msm-4.14

parents 12901724 5190df81

drivers/base/arch_topology.c

+6 −6
Original line number Diff line number Diff line
@@ -399,11 +399,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 __initdata;

static void __init parsing_done_workfn(struct work_struct *work);

static __initdata DECLARE_WORK(parsing_done_work, parsing_done_workfn);

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 int __init

static int

init_cpu_capacity_callback(struct notifier_block *nb,

			   unsigned long val,

			   void *data)
@@ -441,7 +441,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, 
	return 0;

}



static struct notifier_block init_cpu_capacity_notifier __initdata = {

static struct notifier_block init_cpu_capacity_notifier = {

	.notifier_call = init_cpu_capacity_callback,

};
@@ -474,7 +474,7 @@ static int __init register_cpufreq_notifier(void) 
}

core_initcall(register_cpufreq_notifier);



static void __init parsing_done_workfn(struct work_struct *work)

static void parsing_done_workfn(struct work_struct *work)

{

	cpufreq_unregister_notifier(&init_cpu_capacity_notifier,

					 CPUFREQ_POLICY_NOTIFIER);