x86/cleanups change for v4.3

GIT PULL Ingo Molnar 1 participant 1 message Aug 31, 2015

Subsystems (4)

x86 ACPI x86 microcode update support Cpuid/msr driver

lore

Share & tools

lore

Ingo Molnar

author

2015-08-31 17:43 UTC #0 lore raw

Linus,

Please pull the latest x86-cleanups-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus

# HEAD: 4daa832d99871356f5fdc52372c975e40f73a15e x86: Drop bogus __ref / __refdata annotations

A single change: fix obsolete init code annotations.

Thanks,

Ingo

------------------>
Mathias Krause (1):
x86: Drop bogus __ref / __refdata annotations

 arch/x86/kernel/acpi/boot.c                 | 8 +-------
 arch/x86/kernel/apic/x2apic_cluster.c       | 2 +-
 arch/x86/kernel/cpu/microcode/core.c        | 2 +-
 arch/x86/kernel/cpu/microcode/intel_early.c | 2 +-
 arch/x86/kernel/cpuid.c                     | 2 +-
 arch/x86/kernel/smpboot.c                   | 2 +-
 arch/x86/kernel/topology.c                  | 4 ++--
 7 files changed, 8 insertions(+), 14 deletions(-)

arch/x86/kernel/acpi/boot.c +1 -7

index e49ee24da85e..75e8bad53798 100644
@@ -710,7 +710,7 @@ static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
 #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;

@@ -726,12 +726,6 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)
 	*pcpu = cpu;
 	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);
 
 int acpi_unmap_cpu(int cpu)

arch/x86/kernel/apic/x2apic_cluster.c +1 -1

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

arch/x86/kernel/cpu/microcode/core.c +1 -1

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

arch/x86/kernel/cpu/microcode/intel_early.c +1 -1

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

arch/x86/kernel/cpuid.c +1 -1

index 83741a71558f..bd3507da39f0 100644
@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
 	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,
 };

arch/x86/kernel/smpboot.c +1 -1

index b1f3ed9c7a9e..1d06cf8c0093 100644
@@ -1358,7 +1358,7 @@ static void remove_siblinginfo(int cpu)
 	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);
 	cpumask_clear_cpu(cpu, cpu_callout_mask);

arch/x86/kernel/topology.c +2 -2

index 649b010da00b..12cbe2b88c0f 100644
@@ -57,7 +57,7 @@ __setup("cpu0_hotplug", enable_cpu0_hotplug);
  *
  * 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);
 	int ret;

@@ -104,7 +104,7 @@ static int __init debug_hotplug_cpu(void)
 late_initcall_sync(debug_hotplug_cpu);
 #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);