diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-21 11:25:19 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-21 11:25:19 -0800 |
commit | 40c93d7fff6ff05c1c4c9f9c01a067eac6a791b1 (patch) | |
tree | 556b6abff801eac43278030c7e7c7a65642b0e3e /Makefile | |
parent | af16bdeae8e036942590a2c1f4227fecda477e7a (diff) | |
parent | ac5d272a0ad0419f52e08c91953356e32b075af7 (diff) |
Merge tag 'x86-urgent-2021-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
- Move the command line preparation and the early command line parsing
earlier so that the command line parameters which affect
early_reserve_memory(), e.g. efi=nosftreserve, are taken into
account. This was broken when the invocation of
early_reserve_memory() was moved recently.
- Use an atomic type for the SGX page accounting, which is read and
written locklessly, to plug various race conditions related to it.
* tag 'x86-urgent-2021-11-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/sgx: Fix free page accounting
x86/boot: Pull up cmdline preparation and early param parsing
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions