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

Commit 6d3c5111 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Tony Luck
Browse files

[IA64] fix section mismatch in arch/ia64/kernel/topology.c 



This patch silences:

	WARNING: vmlinux.o(.text+0x44672): Section mismatch in
	reference from the function arch_register_cpu() to the
	function .cpuinit.text:register_cpu()

Changes are based on codes in arch/x86/kernel/topology.c

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 9d4efae6

arch/ia64/kernel/topology.c

+10 −6
Original line number Diff line number Diff line
@@ -36,9 +36,11 @@ void arch_fix_phys_package_id(int num, u32 slot) 
}

EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);



int arch_register_cpu(int num)



#ifdef CONFIG_HOTPLUG_CPU

int __ref arch_register_cpu(int num)

{

#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)

#ifdef CONFIG_ACPI

	/*

	 * If CPEI can be re-targetted or if this is not

	 * CPEI target, then it is hotpluggable
@@ -47,19 +49,21 @@ int arch_register_cpu(int num) 
		sysfs_cpus[num].cpu.hotpluggable = 1;

	map_cpu_to_node(num, node_cpuid[num].nid);

#endif



	return register_cpu(&sysfs_cpus[num].cpu, num);

}



#ifdef CONFIG_HOTPLUG_CPU

EXPORT_SYMBOL(arch_register_cpu);



void arch_unregister_cpu(int num)

{

	unregister_cpu(&sysfs_cpus[num].cpu);

	unmap_cpu_from_node(num, cpu_to_node(num));

}

EXPORT_SYMBOL(arch_register_cpu);

EXPORT_SYMBOL(arch_unregister_cpu);

#else

static int __init arch_register_cpu(int num)

{

	return register_cpu(&sysfs_cpus[num].cpu, num);

}

#endif /*CONFIG_HOTPLUG_CPU*/

include/asm-ia64/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ DECLARE_PER_CPU(struct ia64_cpu, cpu_devices); 


DECLARE_PER_CPU(int, cpu_state);



extern int arch_register_cpu(int num);

#ifdef CONFIG_HOTPLUG_CPU

extern int arch_register_cpu(int num);

extern void arch_unregister_cpu(int);

#endif