diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /arch/x86/kernel/cpu/amd.c | |
parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) |
Merge branch 'x86/cache' into perf/core, to pick up fixes
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 22ab408177b2..eeea634bee0a 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -922,7 +922,7 @@ static void init_amd(struct cpuinfo_x86 *c) | |||
922 | static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size) | 922 | static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size) |
923 | { | 923 | { |
924 | /* AMD errata T13 (order #21922) */ | 924 | /* AMD errata T13 (order #21922) */ |
925 | if ((c->x86 == 6)) { | 925 | if (c->x86 == 6) { |
926 | /* Duron Rev A0 */ | 926 | /* Duron Rev A0 */ |
927 | if (c->x86_model == 3 && c->x86_stepping == 0) | 927 | if (c->x86_model == 3 && c->x86_stepping == 0) |
928 | size = 64; | 928 | size = 64; |