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

Commit 0c0fee01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 init code fixlet from Ingo Molnar:
 "A single change: fix obsolete init code annotations"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Drop bogus __ref / __refdata annotations
parents a0c0d985 4daa832d

arch/x86/kernel/acpi/boot.c

+1 −7
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -459,7 +459,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,

};