leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: invoke acpi_sleep_init() earlier

Browse Source 
late_initcall() is too late for acpi_sleep_init().
Call it directly from acpi_init code.

http://bugzilla.kernel.org/show_bug.cgi?id=7887

Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: Vladimir Lebedev <vladimir.p.lebedev@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Alexey Starikovskiy 2007-02-10 01:32:16 -05:00 committed by Len Brown
parent ed41dab90e
commit aafbcd165a
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/acpi/bus.c
View File

@ -699,6 +699,9 @@ static int __init acpi_bus_init(void)
printk(KERN_INFO PREFIX "Interpreter enabled\n"); printk(KERN_INFO PREFIX "Interpreter enabled\n");
/* Initialize sleep structures */
acpi_sleep_init();
/* /*
* Get the system interrupt model and evaluate \_PIC. * Get the system interrupt model and evaluate \_PIC.
*/ */

3
drivers/acpi/sleep/main.c
View File

@ -200,7 +200,7 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
{}, {},
}; };
static int __init acpi_sleep_init(void) int __init acpi_sleep_init(void)
{ {
int i = 0; int i = 0;
@ -229,4 +229,3 @@ static int __init acpi_sleep_init(void)
return 0; return 0;
} }
late_initcall(acpi_sleep_init);

10
include/acpi/acpi_drivers.h
View File

@ -128,4 +128,14 @@ extern void unregister_hotplug_dock_device(acpi_handle handle);
#define register_hotplug_dock_device(h1, h2, c) (-ENODEV) #define register_hotplug_dock_device(h1, h2, c) (-ENODEV)
#define unregister_hotplug_dock_device(h) do { } while(0) #define unregister_hotplug_dock_device(h) do { } while(0)
#endif #endif
/*--------------------------------------------------------------------------
Suspend/Resume
-------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_SLEEP
extern int acpi_sleep_init(void);
#else
#define acpi_sleep_init() do {} while (0)
#endif
#endif /*__ACPI_DRIVERS_H__*/ #endif /*__ACPI_DRIVERS_H__*/