Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source

Pull x86 cpu updates from Ingo Molnar:
 "Two changes: a suspend/resume quirk and a new CPUID bit definition"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpufeature: Add feature bit for Intel's Silicon Debug CPUID bit
  x86/cpu: Restore MSR_IA32_ENERGY_PERF_BIAS after resume

...

This commit is contained in:

Linus Torvalds 2015-09-01 09:41:03 -07:00

parent 0c0fee018d b1c599b8ff

commit 6b2282aa37

4 changed files with 52 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/include/asm/cpufeature.h

View file

18

arch/x86/kernel/cpu/common.c

View file

1

arch/x86/kernel/cpu/cpu.h

View file

47

arch/x86/kernel/cpu/intel.c

View file