From 434b274f11d882dc1ae2e7e29a30f5f608243056 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Mon, 15 Dec 2003 15:38:44 -0500 Subject: [PATCH] [ACPI] /proc/acpi files appear in /proc if acpi=off (Shaohua David Li) --- drivers/acpi/scan.c | 3 +++ drivers/acpi/sleep/proc.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 374ef67221281..2477aab0c73a9 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -336,6 +336,9 @@ acpi_bus_register_driver ( ACPI_FUNCTION_TRACE("acpi_bus_register_driver"); + if (acpi_disabled) + return_VALUE(-ENODEV); + if (driver) { spin_lock(&acpi_device_lock); list_add_tail(&driver->node, &acpi_bus_drivers); diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index 20304d2dd72de..9290427f20417 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c @@ -374,6 +374,9 @@ static int acpi_sleep_proc_init(void) { struct proc_dir_entry *entry = NULL; + if (acpi_disabled) + return 0; + /* 'sleep' [R/W]*/ entry = create_proc_entry(ACPI_SYSTEM_FILE_SLEEP, S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir); -- 2.53.0