diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-22 17:08:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-22 17:08:16 -0800 |
| commit | fca1037864a9fb75c9c48cb65649b24de8101ec4 (patch) | |
| tree | 1f7b74fa822afc3998c34a88c11d4526b9b09885 /fs/cifs/connect.c | |
| parent | 0a115e5f23b948be369faf14d3bccab283830f56 (diff) | |
| parent | 21b5ee59ef18e27d85810584caf1f7ddc705ea83 (diff) | |
Merge tag 'x86-urgent-2020-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"Two fixes for x86:
- Remove the __force_oder definiton from the kaslr boot code as it is
already defined in the page table code which makes GCC 10 builds
fail because it changed the default to -fno-common.
- Address the AMD erratum 1054 concerning the IRPERF capability and
enable the Instructions Retired fixed counter on machines which are
not affected by the erratum"
* tag 'x86-urgent-2020-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF
x86/boot/compressed: Don't declare __force_order in kaslr_64.c
Diffstat (limited to 'fs/cifs/connect.c')
0 files changed, 0 insertions, 0 deletions