aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/tables.c
diff options
context:
space:
mode:
authorLv Zheng <[email protected]>2016-03-02 06:16:25 +0000
committerRafael J. Wysocki <[email protected]>2016-03-09 22:55:02 +0000
commitc85cc817e5b6c45a78c3b34170dfeb6469b56d82 (patch)
tree3e1ce3ec6fddb6ca5202f048b99a9618eb0270c7 /drivers/acpi/tables.c
parentACPI / OSL: Clean up initrd table override code (diff)
downloadkernel-c85cc817e5b6c45a78c3b34170dfeb6469b56d82.tar.gz
kernel-c85cc817e5b6c45a78c3b34170dfeb6469b56d82.zip
ACPI / OSL: Add support to install tables via initrd
This patch adds support to install tables from initrd. If a table in the initrd wasn't used by the override mechanism, the table would be installed after initializing all RSDT/XSDT tables. Link: https://lkml.org/lkml/2014/2/28/368 Reported-by: Thomas Renninger <[email protected]> Signed-off-by: Lv Zheng <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
Diffstat (limited to 'drivers/acpi/tables.c')
-rw-r--r--drivers/acpi/tables.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 6c0f0794aa82..57c0a4525dba 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -32,6 +32,7 @@
#include <linux/errno.h>
#include <linux/acpi.h>
#include <linux/bootmem.h>
+#include "internal.h"
#define ACPI_MAX_TABLES 128
@@ -456,6 +457,7 @@ int __init acpi_table_init(void)
status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
if (ACPI_FAILURE(status))
return -EINVAL;
+ acpi_initrd_initialize_tables();
check_multiple_madt();
return 0;