diff options
| author | Linus Torvalds | 2017-06-02 08:53:42 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-06-02 08:53:42 -0700 |
| commit | f2a025defd804be938f8acffe62e4801a3ed1601 (patch) | |
| tree | 95aca7ea234389743b7c148961647c84da1bcfff /kernel | |
| parent | f56f88ee3fa1c3080f6ba122a597e75f0d5ab969 (diff) | |
| parent | c08d517480ea342cc43acdacc5cf4a795e18151d (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes:
- revert a broken PAT commit that broke a number of systems
- fix two preemptability warnings/bugs that can trigger under certain
circumstances, in the debug code and in the microcode loader"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "x86/PAT: Fix Xorg regression on CPUs that don't support PAT"
x86/debug/32: Convert a smp_processor_id() call to raw to avoid DEBUG_PREEMPT warning
x86/microcode/AMD: Change load_microcode_amd()'s param to bool to fix preemptibility bug
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions