diff options
| author | Ingo Molnar | 2017-10-14 10:11:45 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2017-10-14 10:11:45 +0200 |
| commit | 6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch) | |
| tree | 7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /drivers/base/arch_topology.c | |
| parent | x86/unwinder: Make CONFIG_UNWINDER_ORC=y the default in the 64-bit defconfig (diff) | |
| parent | objtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER (diff) | |
| download | kernel-qcow2-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.gz kernel-qcow2-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.xz kernel-qcow2-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.zip | |
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/base/arch_topology.c')
| -rw-r--r-- | drivers/base/arch_topology.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 41be9ff7d70a..6df7d6676a48 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -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); |