diff options
| author | Len Brown <len.brown@intel.com> | 2007-05-30 00:26:11 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-30 00:26:11 -0400 |
| commit | dd272b5716a54afa33a69f2241284d8ec60b7892 (patch) | |
| tree | 55149eaeff58b0406cf9a86de5b38606bca5924c | |
| parent | f507654d450d329c81a70eec0096d5dfe67802ec (diff) | |
| download | linux-dd272b5716a54afa33a69f2241284d8ec60b7892.tar.bz2 | |
ACPI: add __init to acpi_initialize_subsystem()
Add __init to:
acpi_initialize_subsystem() (and un-export it)
acpi_os_initialize()
Add __initdata to:
acpi_osl_dmi_table[]
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/osl.c | 6 | ||||
| -rw-r--r-- | drivers/acpi/utilities/utxface.c | 4 | ||||
| -rw-r--r-- | include/acpi/acpiosxf.h | 2 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index e349879d9246..58ceb18ec997 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -86,7 +86,7 @@ int osi_linux; /* disable _OSI(Linux) by default */ #ifdef CONFIG_DMI -static struct dmi_system_id acpi_osl_dmi_table[]; +static struct __initdata dmi_system_id acpi_osl_dmi_table[]; #endif static void __init acpi_request_region (struct acpi_generic_address *addr, @@ -137,7 +137,7 @@ static int __init acpi_reserve_resources(void) } device_initcall(acpi_reserve_resources); -acpi_status acpi_os_initialize(void) +acpi_status __init acpi_os_initialize(void) { dmi_check_system(acpi_osl_dmi_table); return AE_OK; @@ -1243,7 +1243,7 @@ static int dmi_osi_linux(struct dmi_system_id *d) } #endif -static struct dmi_system_id acpi_osl_dmi_table[] = { +static struct dmi_system_id acpi_osl_dmi_table[] __initdata = { #ifdef OSI_LINUX_ENABLED /* * Boxes that need NOT _OSI(Linux) diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c index e9a57806cd34..2d496918b3cd 100644 --- a/drivers/acpi/utilities/utxface.c +++ b/drivers/acpi/utilities/utxface.c @@ -61,7 +61,7 @@ ACPI_MODULE_NAME("utxface") * called, so any early initialization belongs here. * ******************************************************************************/ -acpi_status acpi_initialize_subsystem(void) +acpi_status __init acpi_initialize_subsystem(void) { acpi_status status; @@ -108,8 +108,6 @@ acpi_status acpi_initialize_subsystem(void) return_ACPI_STATUS(status); } -ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem) - /******************************************************************************* * * FUNCTION: acpi_enable_subsystem diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index de26ee13835c..ca882b8e7d10 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -78,7 +78,7 @@ struct acpi_signal_fatal_info { /* * OSL Initialization and shutdown primitives */ -acpi_status acpi_os_initialize(void); +acpi_status __initdata acpi_os_initialize(void); acpi_status acpi_os_terminate(void); diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index e08f7df85a4f..b5cca5daa348 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -55,7 +55,7 @@ acpi_status acpi_initialize_tables(struct acpi_table_desc *initial_storage, u32 initial_table_count, u8 allow_resize); -acpi_status acpi_initialize_subsystem(void); +acpi_status __init acpi_initialize_subsystem(void); acpi_status acpi_enable_subsystem(u32 flags); |