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

Commit 0d96b9ff authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: Use hard_smp_processor_id() to get apic id for AMD K8 cpus 



Otherwise, system with apci id lifting will have wrong apicid in
/proc/cpuinfo.

and use that in srat_detect_node().

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
LKML-Reference: <4A998CCA.1040407@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5a925b42

arch/x86/kernel/cpu/amd.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -336,7 +336,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) 
#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)

#if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)

	int cpu = smp_processor_id();

	int cpu = smp_processor_id();

	int node;

	int node;

	unsigned apicid = cpu_has_apic ? hard_smp_processor_id() : c->apicid;

	unsigned apicid = c->apicid;





	node = per_cpu(cpu_llc_id, cpu);

	node = per_cpu(cpu_llc_id, cpu);
@@ -481,6 +481,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
	}

	}

	if (c->x86 == 0x10 || c->x86 == 0x11)

	if (c->x86 == 0x10 || c->x86 == 0x11)

		set_cpu_cap(c, X86_FEATURE_REP_GOOD);

		set_cpu_cap(c, X86_FEATURE_REP_GOOD);



	/* get apicid instead of initial apic id from cpuid */

	c->apicid = hard_smp_processor_id();

#else

#else





	/*

	/*