@@ -237,31 +237,29 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header)
}
}
-
int __init
-acpi_table_parse_entries(char *id,
- unsigned long table_size,
- int entry_id,
- acpi_table_entry_handler handler,
- unsigned int max_entries)
+acpi_parse_entries(char *id,
+ unsigned long table_size,
+ acpi_table_entry_handler handler,
+ struct acpi_table_header *table_header,
+ int entry_id,
+ unsigned int max_entries)
{
- struct acpi_table_header *table_header = NULL;
- struct acpi_subtable_header *entry;
+ struct acpi_subtable_header *entry;
unsigned int count = 0;
unsigned long table_end;
- if (!handler)
- return -EINVAL;
+ if ( !handler )
+ return -EINVAL;
- if (strncmp(id, ACPI_SIG_MADT, 4) == 0)
- acpi_get_table(id, acpi_apic_instance, &table_header);
- else
- acpi_get_table(id, 0, &table_header);
+ if ( !table_size )
+ return -EINVAL;
- if (!table_header) {
- printk(KERN_WARNING PREFIX "%4.4s not present\n", id);
- return -ENODEV;
- }
+ if ( !table_header )
+ {
+ printk("Table header not present\n");
+ return -ENODEV;
+ }
table_end = (unsigned long)table_header + table_header->length;
@@ -292,6 +290,32 @@ acpi_table_parse_entries(char *id,
}
return count;
+
+}
+int __init
+acpi_table_parse_entries(char *id,
+ unsigned long table_size,
+ int entry_id,
+ acpi_table_entry_handler handler,
+ unsigned int max_entries)
+{
+ struct acpi_table_header *table_header = NULL;
+
+ if (!handler)
+ return -EINVAL;
+
+ if (strncmp(id, ACPI_SIG_MADT, 4) == 0)
+ acpi_get_table(id, acpi_apic_instance, &table_header);
+ else
+ acpi_get_table(id, 0, &table_header);
+
+ if (!table_header) {
+ printk(KERN_WARNING PREFIX "%4.4s not present\n", id);
+ return -ENODEV;
+ }
+
+ return acpi_parse_entries(id, table_size, handler, table_header,
+ entry_id, max_entries);
}
int __init
@@ -74,6 +74,9 @@ int acpi_table_init (void);
int acpi_table_parse(char *id, acpi_table_handler handler);
int acpi_table_parse_entries(char *id, unsigned long table_size,
int entry_id, acpi_table_entry_handler handler, unsigned int max_entries);
+int acpi_parse_entries(char *id, unsigned long table_size,
+ acpi_table_entry_handler handler, struct acpi_table_header *table_header,
+ int entry_id, unsigned int max_entries);
int acpi_table_parse_madt(enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries);
int acpi_table_parse_srat(int id, acpi_madt_entry_handler handler,
unsigned int max_entries);