diff options
author | Takashi Iwai | 2016-07-02 10:50:45 +0200 |
---|---|---|
committer | Takashi Iwai | 2016-07-02 10:50:45 +0200 |
commit | 046e9ceefab985a137fbd15b946497a88e5a6513 (patch) | |
tree | 29cb2fd3a2783afacc7901f3310bea7a02f84140 /arch/x86/kernel/cpu/amd.c | |
parent | ALSA: au88x0: Fix calculation in vortex_wtdma_bufshift() (diff) | |
parent | Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and 'asoc/f... (diff) | |
download | kernel-qcow2-linux-046e9ceefab985a137fbd15b946497a88e5a6513.tar.gz kernel-qcow2-linux-046e9ceefab985a137fbd15b946497a88e5a6513.tar.xz kernel-qcow2-linux-046e9ceefab985a137fbd15b946497a88e5a6513.zip |
Merge tag 'asoc-fix-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.7
A small clutch of hardware specific fixes for various ASoC devices, all
small individually and important if you have that device but not
otherwise.
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index c343a54bed39..f5c69d8974e1 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -674,14 +674,14 @@ static void init_amd_bd(struct cpuinfo_x86 *c) u64 value; /* re-enable TopologyExtensions if switched off by BIOS */ - if ((c->x86_model >= 0x10) && (c->x86_model <= 0x1f) && + if ((c->x86_model >= 0x10) && (c->x86_model <= 0x6f) && !cpu_has(c, X86_FEATURE_TOPOEXT)) { if (msr_set_bit(0xc0011005, 54) > 0) { rdmsrl(0xc0011005, value); if (value & BIT_64(54)) { set_cpu_cap(c, X86_FEATURE_TOPOEXT); - pr_info(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n"); + pr_info_once(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n"); } } } |