Commit 3d12fd4e authored by Andy Grover's avatar Andy Grover Committed by Andy Grover

A trio of minor fixes:

Export acpi_get_firmware_table (Matthew Wilcox)
Use proper root proc entry (Kochi Takayoshi)
Fix early-boot table parsing (Bjorn Helgaas)
parent 8d335aba
......@@ -62,6 +62,7 @@ EXPORT_SYMBOL(acpi_get_object_info);
EXPORT_SYMBOL(acpi_get_next_object);
EXPORT_SYMBOL(acpi_evaluate_object);
EXPORT_SYMBOL(acpi_get_table);
EXPORT_SYMBOL(acpi_get_firmware_table);
EXPORT_SYMBOL(acpi_install_notify_handler);
EXPORT_SYMBOL(acpi_remove_notify_handler);
EXPORT_SYMBOL(acpi_install_gpe_handler);
......
......@@ -2052,7 +2052,7 @@ acpi_bus_init (void)
/* Mimic structured exception handling */
error4:
remove_proc_entry("ACPI", NULL);
remove_proc_entry(ACPI_BUS_FILE_ROOT, NULL);
error3:
acpi_bus_remove(acpi_root, ACPI_BUS_REMOVAL_NORMAL);
error2:
......
......@@ -36,7 +36,7 @@
#define PREFIX "ACPI: "
#define ACPI_MAX_TABLES ACPI_TABLE_COUNT
#define ACPI_MAX_TABLES 256
static char *acpi_table_signatures[ACPI_TABLE_COUNT] = {
[ACPI_TABLE_UNKNOWN] = "????",
......@@ -338,7 +338,7 @@ acpi_table_get_sdt (
sdt.count = (header->length - sizeof(struct acpi_table_header)) >> 3;
if (sdt.count > ACPI_MAX_TABLES) {
printk(KERN_WARNING PREFIX "Truncated %lu XSDT entries\n",
(ACPI_MAX_TABLES - sdt.count));
(sdt.count - ACPI_MAX_TABLES));
sdt.count = ACPI_MAX_TABLES;
}
......@@ -383,7 +383,7 @@ acpi_table_get_sdt (
sdt.count = (header->length - sizeof(struct acpi_table_header)) >> 2;
if (sdt.count > ACPI_MAX_TABLES) {
printk(KERN_WARNING PREFIX "Truncated %lu RSDT entries\n",
(ACPI_TABLE_COUNT - sdt.count));
(sdt.count - ACPI_TABLE_COUNT));
sdt.count = ACPI_MAX_TABLES;
}
......
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