Skip to content

Commit 181a984

Browse files
committed
Merge tag 'x86_cleanups_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Borislav Petkov: - Remove an unused function and the documentation of an already removed cmdline parameter * tag 'x86_cleanups_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Remove unused function __fortify_panic() Documentation: Remove "mfgpt_irq=" from the kernel-parameters.txt file
2 parents 4578d07 + 7131503 commit 181a984

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3408,10 +3408,6 @@
34083408
deep - Suspend-To-RAM or equivalent (if supported)
34093409
See Documentation/admin-guide/pm/sleep-states.rst.
34103410

3411-
mfgpt_irq= [IA-32] Specify the IRQ to use for the
3412-
Multi-Function General Purpose Timers on AMD Geode
3413-
platforms.
3414-
34153411
mfgptfix [X86-32] Fix MFGPT timers on AMD Geode platforms when
34163412
the BIOS has incorrectly applied a workaround. TinyBIOS
34173413
version 0.98 is known to be affected, 0.99 fixes the

arch/x86/boot/compressed/misc.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -531,8 +531,3 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output)
531531

532532
return output + entry_offset;
533533
}
534-
535-
void __fortify_panic(const u8 reason, size_t avail, size_t size)
536-
{
537-
error("detected buffer overflow");
538-
}

0 commit comments

Comments
 (0)