diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-03-25 15:20:44 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-03-25 15:20:44 +0100 |
commit | 629b3df7ecb01fddfdf71cb5d3c563d143117c33 (patch) | |
tree | a2e5ad1266c9660c934b9bf7a1621f6a3a48e28b /arch/x86/kernel/cpu/amd.c | |
parent | 3442a9ecb8e72a33c28a2b969b766c659830e410 (diff) | |
parent | d97828072d0bcecb6655f0966efc38a2647d3dfb (diff) | |
download | linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.tar.gz linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.tar.bz2 linux-629b3df7ecb01fddfdf71cb5d3c563d143117c33.zip |
Merge branch 'x86/cpu' into perf/core, to resolve conflict
Conflicts:
arch/x86/events/intel/uncore.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 1f875fbe1384..af952d7ed2fc 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -926,7 +926,8 @@ static void init_amd(struct cpuinfo_x86 *c) case 0x12: init_amd_ln(c); break; case 0x15: init_amd_bd(c); break; case 0x16: init_amd_jg(c); break; - case 0x17: init_amd_zn(c); break; + case 0x17: fallthrough; + case 0x19: init_amd_zn(c); break; } /* |