Commit 141a0af3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: call acpi_system_init() explicitly rather than as initcall

This patch makes acpi_init() call acpi_system_init() directly.
Previously, both were subsys_initcalls.  acpi_system_init()
must happen after acpi_init(), and it's better to call it
explicitly rather than rely on link ordering.
Signed-off-by: default avatarBjorn Helgaas <>
Signed-off-by: default avatarLen Brown <>
parent 44515374
......@@ -882,6 +882,7 @@ static int __init acpi_init(void)
return result;
/* For use by Linux/ACPI infrastructure, not drivers */
int acpi_scan_init(void);
int acpi_system_init(void);
/* --------------------------------------------------------------------------
Power Resource
......@@ -571,12 +571,9 @@ static int acpi_system_procfs_init(void)
static int __init acpi_system_init(void)
int __init acpi_system_init(void)
int result = 0;
if (acpi_disabled)
return 0;
int result;
result = acpi_system_procfs_init();
if (result)
......@@ -586,5 +583,3 @@ static int __init acpi_system_init(void)
return result;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment