diff options
| author | Andy Grover <agrover@groveronline.com> | 2002-08-14 04:41:19 -0700 |
|---|---|---|
| committer | Andy Grover <agrover@acpi3.jf.intel.com> | 2002-08-14 04:41:19 -0700 |
| commit | 3d12fd4e7a4c237d37766a005d09eecf72d87352 (patch) | |
| tree | 9d4c08e2ac301ec61a6fae9c85427eaf6bed2218 | |
| parent | 8d335aba5dc0fab58d7e859da11c54fd0722b4a6 (diff) | |
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)
| -rw-r--r-- | drivers/acpi/acpi_ksyms.c | 1 | ||||
| -rw-r--r-- | drivers/acpi/bus.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/tables.c | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acpi/acpi_ksyms.c b/drivers/acpi/acpi_ksyms.c index f67a090c3fee..91e2ac7835cc 100644 --- a/drivers/acpi/acpi_ksyms.c +++ b/drivers/acpi/acpi_ksyms.c @@ -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); diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 881d02a7c5c7..17e8678807b4 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -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: diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 4a9f20ffa730..cc937f1356bb 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -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; } |