diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-22 03:03:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-22 03:03:39 +0100 |
| commit | cb715a836642e0ec69350670d1c2f800f3e2d2e4 (patch) | |
| tree | c4055162dee46d32a4318f18f1c7c70bc3f3f970 /arch/x86/kernel/ftrace.c | |
| parent | Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | x86, kvm: Add MSR_AMD64_BU_CFG2 to the list of ignored MSRs (diff) | |
| download | linux-cb715a836642e0ec69350670d1c2f800f3e2d2e4.tar.xz linux-cb715a836642e0ec69350670d1c2f800f3e2d2e4.zip | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu updates from Peter Anvin:
"This is a corrected attempt at the x86/cpu branch, this time with the
fixes in that makes it not break on KVM (current or past), or any
other virtualizer which traps on this configuration.
Again, the biggest change here is enabling the WC+ memory type on AMD
processors, if the BIOS doesn't."
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, kvm: Add MSR_AMD64_BU_CFG2 to the list of ignored MSRs
x86, cpu, amd: Fix WC+ workaround for older virtual hosts
x86, AMD: Enable WC+ memory type on family 10 processors
x86, AMD: Clean up init_amd()
x86/process: Change %8s to %s for pr_warn() in release_thread()
x86/cpu/hotplug: Remove CONFIG_EXPERIMENTAL dependency
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
0 files changed, 0 insertions, 0 deletions