Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mathias Krause and committed by
Ingo Molnar
4daa832d 52721d9d

+8 -14
+1 -7
arch/x86/kernel/acpi/boot.c
··· 710 710 #endif 711 711 } 712 712 713 - static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) 713 + int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu) 714 714 { 715 715 int cpu; 716 716 ··· 725 725 726 726 *pcpu = cpu; 727 727 return 0; 728 - } 729 - 730 - /* wrapper to silence section mismatch warning */ 731 - int __ref acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu) 732 - { 733 - return _acpi_map_lsapic(handle, physid, pcpu); 734 728 } 735 729 EXPORT_SYMBOL(acpi_map_cpu); 736 730
+1 -1
arch/x86/kernel/apic/x2apic_cluster.c
··· 182 182 return notifier_from_errno(err); 183 183 } 184 184 185 - static struct notifier_block __refdata x2apic_cpu_notifier = { 185 + static struct notifier_block x2apic_cpu_notifier = { 186 186 .notifier_call = update_clusterinfo, 187 187 }; 188 188
+1 -1
arch/x86/kernel/cpu/microcode/core.c
··· 460 460 return NOTIFY_OK; 461 461 } 462 462 463 - static struct notifier_block __refdata mc_cpu_notifier = { 463 + static struct notifier_block mc_cpu_notifier = { 464 464 .notifier_call = mc_cpu_callback, 465 465 }; 466 466
+1 -1
arch/x86/kernel/cpu/microcode/intel_early.c
··· 390 390 } 391 391 392 392 #ifdef DEBUG 393 - static void __ref show_saved_mc(void) 393 + static void show_saved_mc(void) 394 394 { 395 395 int i, j; 396 396 unsigned int sig, pf, rev, total_size, data_size, date;
+1 -1
arch/x86/kernel/cpuid.c
··· 170 170 return notifier_from_errno(err); 171 171 } 172 172 173 - static struct notifier_block __refdata cpuid_class_cpu_notifier = 173 + static struct notifier_block cpuid_class_cpu_notifier = 174 174 { 175 175 .notifier_call = cpuid_class_cpu_callback, 176 176 };
+1 -1
arch/x86/kernel/smpboot.c
··· 1358 1358 cpumask_clear_cpu(cpu, cpu_sibling_setup_mask); 1359 1359 } 1360 1360 1361 - static void __ref remove_cpu_from_maps(int cpu) 1361 + static void remove_cpu_from_maps(int cpu) 1362 1362 { 1363 1363 set_cpu_online(cpu, false); 1364 1364 cpumask_clear_cpu(cpu, cpu_callout_mask);
+2 -2
arch/x86/kernel/topology.c
··· 57 57 * 58 58 * This is only called for debugging CPU offline/online feature. 59 59 */ 60 - int __ref _debug_hotplug_cpu(int cpu, int action) 60 + int _debug_hotplug_cpu(int cpu, int action) 61 61 { 62 62 struct device *dev = get_cpu_device(cpu); 63 63 int ret; ··· 104 104 late_initcall_sync(debug_hotplug_cpu); 105 105 #endif /* CONFIG_DEBUG_HOTPLUG_CPU0 */ 106 106 107 - int __ref arch_register_cpu(int num) 107 + int arch_register_cpu(int num) 108 108 { 109 109 struct cpuinfo_x86 *c = &cpu_data(num); 110 110