diff options
| -rw-r--r-- | arch/i386/kernel/acpi.c | 5 | ||||
| -rw-r--r-- | arch/i386/kernel/setup.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/tables.c | 3 | ||||
| -rw-r--r-- | include/linux/acpi.h | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/arch/i386/kernel/acpi.c b/arch/i386/kernel/acpi.c index e0ce1cecccad..2a7a4a6b8ba9 100644 --- a/arch/i386/kernel/acpi.c +++ b/arch/i386/kernel/acpi.c @@ -303,8 +303,7 @@ acpi_find_rsdp (void) int __init -acpi_boot_init ( - char *cmdline) +acpi_boot_init (void) { int result = 0; @@ -317,7 +316,7 @@ acpi_boot_init ( /* * Initialize the ACPI boot-time table parser. */ - result = acpi_table_init(cmdline); + result = acpi_table_init(); if (result) return result; diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 73d4dbcfc60e..608f895abc0c 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -900,7 +900,7 @@ void __init setup_arch(char **cmdline_p) * Parse the ACPI tables for possible boot-time SMP configuration. */ if (!acpi_disabled) - acpi_boot_init(*cmdline_p); + acpi_boot_init(); #endif #ifdef CONFIG_X86_LOCAL_APIC if (smp_found_config) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 14819f3f51c7..5cc7467edd51 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -509,8 +509,7 @@ acpi_table_get_sdt ( int __init -acpi_table_init ( - char *cmdline) +acpi_table_init (void) { struct acpi_table_rsdp *rsdp = NULL; unsigned long rsdp_phys = 0; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4cd86e87769d..a1b7189c2514 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -351,10 +351,10 @@ typedef int (*acpi_madt_entry_handler) (acpi_table_entry_header *header); char * __acpi_map_table (unsigned long phys_addr, unsigned long size); unsigned long acpi_find_rsdp (void); -int acpi_boot_init (char *cmdline); +int acpi_boot_init (void); int acpi_numa_init (void); -int acpi_table_init (char *cmdline); +int acpi_table_init (void); int acpi_table_parse (enum acpi_table_id id, acpi_table_handler handler); int acpi_get_table_header_early (enum acpi_table_id id, struct acpi_table_header **header); int acpi_table_parse_madt (enum acpi_madt_entry_id id, acpi_madt_entry_handler handler); |