aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/tables.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2016-03-02 01:16:25 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-09 17:55:02 -0500
commitc85cc817e5b6c45a78c3b34170dfeb6469b56d82 (patch)
tree3e1ce3ec6fddb6ca5202f048b99a9618eb0270c7 /drivers/acpi/tables.c
parenta543132ee04d1599a0abe913eaf43d1986021d24 (diff)
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 <trenn@suse.de> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
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 @@
32#include <linux/errno.h> 32#include <linux/errno.h>
33#include <linux/acpi.h> 33#include <linux/acpi.h>
34#include <linux/bootmem.h> 34#include <linux/bootmem.h>
35#include "internal.h"
35 36
36#define ACPI_MAX_TABLES 128 37#define ACPI_MAX_TABLES 128
37 38
@@ -456,6 +457,7 @@ int __init acpi_table_init(void)
456 status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0); 457 status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0);
457 if (ACPI_FAILURE(status)) 458 if (ACPI_FAILURE(status))
458 return -EINVAL; 459 return -EINVAL;
460 acpi_initrd_initialize_tables();
459 461
460 check_multiple_madt(); 462 check_multiple_madt();
461 return 0; 463 return 0;