diff options
Diffstat (limited to 'drivers/acpi/tables.c')
-rw-r--r-- | drivers/acpi/tables.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index f829e6a2e663..b05df13bd79f 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/bootmem.h> | 34 | #include <linux/bootmem.h> |
35 | #include <linux/earlycpio.h> | 35 | #include <linux/earlycpio.h> |
36 | #include <linux/memblock.h> | 36 | #include <linux/memblock.h> |
37 | #include <linux/initrd.h> | ||
37 | #include "internal.h" | 38 | #include "internal.h" |
38 | 39 | ||
39 | #ifdef CONFIG_ACPI_CUSTOM_DSDT | 40 | #ifdef CONFIG_ACPI_CUSTOM_DSDT |
@@ -481,8 +482,10 @@ static DECLARE_BITMAP(acpi_initrd_installed, NR_ACPI_INITRD_TABLES); | |||
481 | 482 | ||
482 | #define MAP_CHUNK_SIZE (NR_FIX_BTMAPS << PAGE_SHIFT) | 483 | #define MAP_CHUNK_SIZE (NR_FIX_BTMAPS << PAGE_SHIFT) |
483 | 484 | ||
484 | static void __init acpi_table_initrd_init(void *data, size_t size) | 485 | void __init acpi_table_upgrade(void) |
485 | { | 486 | { |
487 | void *data = (void *)initrd_start; | ||
488 | size_t size = initrd_end - initrd_start; | ||
486 | int sig, no, table_nr = 0, total_offset = 0; | 489 | int sig, no, table_nr = 0, total_offset = 0; |
487 | long offset = 0; | 490 | long offset = 0; |
488 | struct acpi_table_header *table; | 491 | struct acpi_table_header *table; |
@@ -696,10 +699,6 @@ next_table: | |||
696 | } | 699 | } |
697 | } | 700 | } |
698 | #else | 701 | #else |
699 | static void __init acpi_table_initrd_init(void *data, size_t size) | ||
700 | { | ||
701 | } | ||
702 | |||
703 | static acpi_status | 702 | static acpi_status |
704 | acpi_table_initrd_override(struct acpi_table_header *existing_table, | 703 | acpi_table_initrd_override(struct acpi_table_header *existing_table, |
705 | acpi_physical_address *address, | 704 | acpi_physical_address *address, |
@@ -742,11 +741,6 @@ acpi_os_table_override(struct acpi_table_header *existing_table, | |||
742 | return AE_OK; | 741 | return AE_OK; |
743 | } | 742 | } |
744 | 743 | ||
745 | void __init early_acpi_table_init(void *data, size_t size) | ||
746 | { | ||
747 | acpi_table_initrd_init(data, size); | ||
748 | } | ||
749 | |||
750 | /* | 744 | /* |
751 | * acpi_table_init() | 745 | * acpi_table_init() |
752 | * | 746 | * |