Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 57283
b: refs/heads/master
c: dd272b5
h: refs/heads/master
i:
  57281: ec495c0
  57279: a283285
v: v3
  • Loading branch information
Len Brown committed May 30, 2007
1 parent 5d5ac17 commit b78d089
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f507654d450d329c81a70eec0096d5dfe67802ec
refs/heads/master: dd272b5716a54afa33a69f2241284d8ec60b7892
6 changes: 3 additions & 3 deletions trunk/drivers/acpi/osl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/acpi/utilities/utxface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -108,8 +108,6 @@ acpi_status acpi_initialize_subsystem(void)
return_ACPI_STATUS(status);
}

ACPI_EXPORT_SYMBOL(acpi_initialize_subsystem)

/*******************************************************************************
*
* FUNCTION: acpi_enable_subsystem
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/acpi/acpiosxf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/acpi/acpixf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit b78d089

Please sign in to comment.