diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 18:11:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 18:11:25 -0700 |
| commit | ccb9331e132a0554f6efb18140eae78bc32b0ee4 (patch) | |
| tree | 9af27985432a7ac6214fecb66cc5eb911eec0ad1 /Documentation/admin-guide | |
| parent | b960327ab340b54f8e20f3af5d0751e2941b6675 (diff) | |
| parent | 4a73b93ce489a58c9a2aac4a5f5cd8cfa58ced64 (diff) | |
Merge tag 'x86_alternatives_for_v7.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 alternatives update from Borislav Petkov:
- Remove the smp_locks alternatives machinery which was used to patch
out lock prefixes when running a SMP kernel on a uniprocessor machine
* tag 'x86_alternatives_for_v7.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/alternative: Drop smp_locks glue
Diffstat (limited to 'Documentation/admin-guide')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6172ef2a71c2..deae852f71e4 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4614,9 +4614,6 @@ Kernel parameters norandmaps Don't use address space randomization. Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space - noreplace-smp [X86-32,SMP] Don't replace SMP instructions - with UP alternatives - noresume [SWSUSP] Disables resume and restores original swap space. |