p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86: Drop bogus __ref / __refdata annotations 

The __ref / __refdata annotations used to be needed because of
referencing functions / variables annotated __cpuinit /
__cpuinitdata.

But those annotations vanished during the development of v3.11.

Therefore most of the __ref / __refdata annotations are not needed
anymore. As they may hide legitimate sections mismatches, we
better get rid of them.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1437409973-8927-1-git-send-email-minipli@googlemail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Mathias Krause 2015-07-20 18:32:53 +02:00 committed by Ingo Molnar
parent 52721d9d33
commit 4daa832d99
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/acpi/boot.c
View File

@ -710,7 +710,7 @@ static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
#endif #endif
} }
static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu)
{ {
int cpu; int cpu;
@ -726,12 +726,6 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)
*pcpu = cpu; *pcpu = cpu;
return 0; return 0;
} }
/* wrapper to silence section mismatch warning */
int __ref acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu)
{
return _acpi_map_lsapic(handle, physid, pcpu);
}
EXPORT_SYMBOL(acpi_map_cpu); EXPORT_SYMBOL(acpi_map_cpu);
int acpi_unmap_cpu(int cpu) int acpi_unmap_cpu(int cpu)

2
arch/x86/kernel/apic/x2apic_cluster.c
View File

@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
return notifier_from_errno(err); return notifier_from_errno(err);
} }
static struct notifier_block __refdata x2apic_cpu_notifier = { static struct notifier_block x2apic_cpu_notifier = {
.notifier_call = update_clusterinfo, .notifier_call = update_clusterinfo,
}; };

2
arch/x86/kernel/cpu/microcode/core.c
View File

@ -460,7 +460,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
return NOTIFY_OK; return NOTIFY_OK;
} }
static struct notifier_block __refdata mc_cpu_notifier = { static struct notifier_block mc_cpu_notifier = {
.notifier_call = mc_cpu_callback, .notifier_call = mc_cpu_callback,
}; };

2
arch/x86/kernel/cpu/microcode/intel_early.c
View File

@ -390,7 +390,7 @@ static int collect_cpu_info_early(struct ucode_cpu_info *uci)
} }
#ifdef DEBUG #ifdef DEBUG
static void __ref show_saved_mc(void) static void show_saved_mc(void)
{ {
int i, j; int i, j;
unsigned int sig, pf, rev, total_size, data_size, date; unsigned int sig, pf, rev, total_size, data_size, date;

2
arch/x86/kernel/cpuid.c
View File

@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
return notifier_from_errno(err); return notifier_from_errno(err);
} }
static struct notifier_block __refdata cpuid_class_cpu_notifier = static struct notifier_block cpuid_class_cpu_notifier =
{ {
.notifier_call = cpuid_class_cpu_callback, .notifier_call = cpuid_class_cpu_callback,
}; };

2
arch/x86/kernel/smpboot.c
View File

@ -1358,7 +1358,7 @@ static void remove_siblinginfo(int cpu)
cpumask_clear_cpu(cpu, cpu_sibling_setup_mask); cpumask_clear_cpu(cpu, cpu_sibling_setup_mask);
} }
static void __ref remove_cpu_from_maps(int cpu) static void remove_cpu_from_maps(int cpu)
{ {
set_cpu_online(cpu, false); set_cpu_online(cpu, false);
cpumask_clear_cpu(cpu, cpu_callout_mask); cpumask_clear_cpu(cpu, cpu_callout_mask);

4
arch/x86/kernel/topology.c
View File

@ -57,7 +57,7 @@ __setup("cpu0_hotplug", enable_cpu0_hotplug);
* *
* This is only called for debugging CPU offline/online feature. * This is only called for debugging CPU offline/online feature.
*/ */
int __ref _debug_hotplug_cpu(int cpu, int action) int _debug_hotplug_cpu(int cpu, int action)
{ {
struct device *dev = get_cpu_device(cpu); struct device *dev = get_cpu_device(cpu);
int ret; int ret;
@ -104,7 +104,7 @@ static int __init debug_hotplug_cpu(void)
late_initcall_sync(debug_hotplug_cpu); late_initcall_sync(debug_hotplug_cpu);
#endif /* CONFIG_DEBUG_HOTPLUG_CPU0 */ #endif /* CONFIG_DEBUG_HOTPLUG_CPU0 */
int __ref arch_register_cpu(int num) int arch_register_cpu(int num)
{ {
struct cpuinfo_x86 *c = &cpu_data(num); struct cpuinfo_x86 *c = &cpu_data(num);