Commit 62cb9747 authored by Andy Grover's avatar Andy Grover

Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi
parents df53773c f59fe995
...@@ -303,8 +303,7 @@ acpi_find_rsdp (void) ...@@ -303,8 +303,7 @@ acpi_find_rsdp (void)
int __init int __init
acpi_boot_init ( acpi_boot_init (void)
char *cmdline)
{ {
int result = 0; int result = 0;
...@@ -317,7 +316,7 @@ acpi_boot_init ( ...@@ -317,7 +316,7 @@ acpi_boot_init (
/* /*
* Initialize the ACPI boot-time table parser. * Initialize the ACPI boot-time table parser.
*/ */
result = acpi_table_init(cmdline); result = acpi_table_init();
if (result) if (result)
return result; return result;
......
...@@ -900,7 +900,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -900,7 +900,7 @@ void __init setup_arch(char **cmdline_p)
* Parse the ACPI tables for possible boot-time SMP configuration. * Parse the ACPI tables for possible boot-time SMP configuration.
*/ */
if (!acpi_disabled) if (!acpi_disabled)
acpi_boot_init(*cmdline_p); acpi_boot_init();
#endif #endif
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
if (smp_found_config) if (smp_found_config)
......
...@@ -509,8 +509,7 @@ acpi_table_get_sdt ( ...@@ -509,8 +509,7 @@ acpi_table_get_sdt (
int __init int __init
acpi_table_init ( acpi_table_init (void)
char *cmdline)
{ {
struct acpi_table_rsdp *rsdp = NULL; struct acpi_table_rsdp *rsdp = NULL;
unsigned long rsdp_phys = 0; unsigned long rsdp_phys = 0;
......
...@@ -351,10 +351,10 @@ typedef int (*acpi_madt_entry_handler) (acpi_table_entry_header *header); ...@@ -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); char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
unsigned long acpi_find_rsdp (void); unsigned long acpi_find_rsdp (void);
int acpi_boot_init (char *cmdline); int acpi_boot_init (void);
int acpi_numa_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_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_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); int acpi_table_parse_madt (enum acpi_madt_entry_id id, acpi_madt_entry_handler handler);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment