Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aafbcd16 authored Feb 10, 2007 by Alexey Starikovskiy Committed by Len Brown Feb 10, 2007

ACPI: invoke acpi_sleep_init() earlier

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>

parent ed41dab9

drivers/acpi/bus.c

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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.
	*/		*/

drivers/acpi/sleep/main.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);

include/acpi/acpi_drivers.h

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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__/