diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-05-29 09:51:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-05-29 09:51:07 +0200 |
| commit | 80a37f0ed3a15ec2c59759194cfc3cac46c828f0 (patch) | |
| tree | dad01f0233ec481065c80bd11d113980573af524 /Documentation | |
| parent | 2b7958209b958e7d43ad0ffd57765a7adfb02324 (diff) | |
| parent | 87a451161f36a34307ca09aaa66f233d68642b5f (diff) | |
| download | linux-next-history-80a37f0ed3a15ec2c59759194cfc3cac46c828f0.tar.gz | |
Merge branch into tip/master: 'x86/cpu'
# New commits in x86/cpu:
87a451161f36 ("x86/cpu: Fix a F00F bug warning and clean up surrounding code")
dedcf8e10441 ("x86/cpu: Add Intel CPU model number for rugged Panther Lake")
fa6dcbc69ad4 ("x86/cpuid: Introduce a centralized CPUID parser")
3aa8f9fce860 ("x86/cpu: Introduce a centralized CPUID data model")
202311a754d4 ("x86/cpuid: Introduce <asm/cpuid/leaf_types.h>")
5fbe09ebb4dc ("x86/cpuid: Rename cpuid_leaf()/cpuid_subleaf() APIs")
55cbcb6731bb ("x86/cpu: Do not include the CPUID API header in asm/processor.h")
21ff606db9c5 ("Documentation: core-api/cpu_hotplug: Remove stale cpu0_hotplug docs")
435ef16e69b9 ("x86/cpu, cpufreq: Remove AMD ELAN support")
823caa173884 ("x86/fpu: Remove the math-emu/ FPU emulation library")
d8b55ce0c995 ("x86/fpu: Remove the 'no387' boot option")
ab05214025ee ("x86/fpu: Remove MATH_EMULATION and related glue code")
7b49a3fb69e7 ("treewide: Explicitly include the x86 CPUID headers")
2ed46bccac39 ("x86/cpu: Remove the CONFIG_X86_INVD_BUG quirk")
db1931e39ba1 ("x86/cpu, x86/platform, watchdog: Remove CONFIG_X86_RDC321X support")
dbafa16ec2b6 ("x86/cpu: Remove TSC-less CONFIG_M586 support")
7d328c5de43a ("x86/cpu: Remove CPU_SUP_UMC_32 support")
aaa3c14d1134 ("x86/cpu: Remove CONFIG_MWINCHIP3D/MWINCHIPC6")
4af2468b82bd ("x86: Mark AMD Geode support as orphaned")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 4 | ||||
| -rw-r--r-- | Documentation/core-api/cpu_hotplug.rst | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 49ac45b44f2b2..91a18d157b455 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4419,10 +4419,6 @@ Kernel parameters These settings can be accessed at runtime via the nmi_watchdog and hardlockup_panic sysctls. - no387 [BUGS=X86-32] Tells the kernel to use the 387 maths - emulation library even if a 387 maths coprocessor - is present. - no4lvl [RISCV,EARLY] Disable 4-level and 5-level paging modes. Forces kernel to use 3-level paging instead. diff --git a/Documentation/core-api/cpu_hotplug.rst b/Documentation/core-api/cpu_hotplug.rst index 9b4afca9fd09c..6de26d1c6a9ad 100644 --- a/Documentation/core-api/cpu_hotplug.rst +++ b/Documentation/core-api/cpu_hotplug.rst @@ -45,11 +45,6 @@ Command Line Switches This option is limited to the X86 and S390 architecture. -``cpu0_hotplug`` - Allow to shutdown CPU0. - - This option is limited to the X86 architecture. - CPU maps ======== |