diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-01 13:56:55 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-01 13:56:55 -0800 |
| commit | f225dbdca9127536b7296778b3b0cfd96f65df00 (patch) | |
| tree | 33156ac8a3748523b5d724cc42ecf96112b16eeb /arch/x86/kernel/cpu/amd.c | |
| parent | f9c1bf30186d62087e475dd56eaf830692f504e8 (diff) | |
| parent | 0a5b451a53d4d181f22ab309403646792e0ddad2 (diff) | |
Merge tag 'v4.4.35' into android-4.4.y
This is the 4.4.35 stable release
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 6cb5834062a3..e2defc7593a4 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -352,7 +352,6 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c) #ifdef CONFIG_SMP unsigned bits; int cpu = smp_processor_id(); - unsigned int socket_id, core_complex_id; bits = c->x86_coreid_bits; /* Low order bits define the core id (index of core in socket) */ @@ -370,10 +369,7 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c) if (c->x86 != 0x17 || !cpuid_edx(0x80000006)) return; - socket_id = (c->apicid >> bits) - 1; - core_complex_id = (c->apicid & ((1 << bits) - 1)) >> 3; - - per_cpu(cpu_llc_id, cpu) = (socket_id << 3) | core_complex_id; + per_cpu(cpu_llc_id, cpu) = c->apicid >> 3; #endif } |