Merge tag 'riscv-for-linus-6.9-mw2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 1606eb622a9ffe2d7015724778035307d5aae1fd..ff1689bb3124dd53a56b275bf2d3075cfa6d9423 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -449,20 +449,6 @@ config ACPI_HED
          which is used to report some hardware errors notified via
          SCI, mainly the corrected errors.
 
-config ACPI_CUSTOM_METHOD
-       tristate "Allow ACPI methods to be inserted/replaced at run time"
-       depends on DEBUG_FS
-       help
-         This debug facility allows ACPI AML methods to be inserted and/or
-         replaced without rebooting the system. For details refer to:
-         Documentation/firmware-guide/acpi/method-customizing.rst.
-
-         NOTE: This option is security sensitive, because it allows arbitrary
-         kernel memory to be written to by root (uid=0) users, allowing them
-         to bypass certain security measures (e.g. if root is not allowed to
-         load additional kernel modules after boot, this feature may be used
-         to override that restriction).
-
 config ACPI_BGRT
        bool "Boottime Graphics Resource Table support"
        depends on EFI && (X86 || ARM64)
@@ -474,7 +460,6 @@ config ACPI_BGRT
 
 config ACPI_REDUCED_HARDWARE_ONLY
        bool "Hardware-reduced ACPI support only" if EXPERT
-       def_bool n
        help
          This config item changes the way the ACPI code is built.  When this
          option is selected, the kernel will use a specialized version of