mirror of
https://github.com/torvalds/linux
synced 2024-10-16 16:29:20 +00:00
x86/cpu/centaur: Replace two-condition switch-case with an if statement
Use a normal if statements instead of a two-condition switch-case. [ bp: Massage commit message. ] Signed-off-by: Tony W Wang-oc <TonyWWang-oc@zhaoxin.com> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/1599562666-31351-2-git-send-email-TonyWWang-oc@zhaoxin.com
This commit is contained in:
parent
61aa9a0a5e
commit
8687bdc041
|
@ -90,18 +90,14 @@ enum {
|
|||
|
||||
static void early_init_centaur(struct cpuinfo_x86 *c)
|
||||
{
|
||||
switch (c->x86) {
|
||||
#ifdef CONFIG_X86_32
|
||||
case 5:
|
||||
/* Emulate MTRRs using Centaur's MCR. */
|
||||
/* Emulate MTRRs using Centaur's MCR. */
|
||||
if (c->x86 == 5)
|
||||
set_cpu_cap(c, X86_FEATURE_CENTAUR_MCR);
|
||||
break;
|
||||
#endif
|
||||
case 6:
|
||||
if (c->x86_model >= 0xf)
|
||||
set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
|
||||
break;
|
||||
}
|
||||
if (c->x86 == 6 && c->x86_model >= 0xf)
|
||||
set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
|
||||
|
||||
#ifdef CONFIG_X86_64
|
||||
set_cpu_cap(c, X86_FEATURE_SYSENTER32);
|
||||
#endif
|
||||
|
@ -145,9 +141,8 @@ static void init_centaur(struct cpuinfo_x86 *c)
|
|||
set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);
|
||||
}
|
||||
|
||||
switch (c->x86) {
|
||||
#ifdef CONFIG_X86_32
|
||||
case 5:
|
||||
if (c->x86 == 5) {
|
||||
switch (c->x86_model) {
|
||||
case 4:
|
||||
name = "C6";
|
||||
|
@ -207,12 +202,10 @@ static void init_centaur(struct cpuinfo_x86 *c)
|
|||
c->x86_cache_size = (cc>>24)+(dd>>24);
|
||||
}
|
||||
sprintf(c->x86_model_id, "WinChip %s", name);
|
||||
break;
|
||||
#endif
|
||||
case 6:
|
||||
init_c3(c);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
if (c->x86 == 6)
|
||||
init_c3(c);
|
||||
#ifdef CONFIG_X86_64
|
||||
set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue