From: Len Brown <len.br...@intel.com>
Allow consumers of the acpi_table_parse()/acpi_table_parse_entries() API
to gracefully handle the acpi_disabled=1 case via return value
rather than checking the global flag themselves.
Signed-off-by: Feng Tang <feng.t...@intel.com>
Signed-off-by: Len Brown <len.br...@intel.com>
[Linux commit e5b8fc6ac158f65598f58dba2c0d52ba3b412f52]
Signed-off-by: Shannon Zhao <shannon.z...@linaro.org>
---
Cc: Jan Beulich <jbeul...@suse.com>
---
xen/drivers/acpi/tables.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c
index 60c4ab1..39f1223 100644
--- a/xen/drivers/acpi/tables.c
+++ b/xen/drivers/acpi/tables.c
@@ -210,6 +210,9 @@ acpi_table_parse_entries(char *id,
unsigned int count = 0;
unsigned long table_end;
+ if (acpi_disabled)
+ return -ENODEV;
+
if (!handler)
return -EINVAL;
@@ -279,6 +282,9 @@ int __init acpi_table_parse(char *id, acpi_table_handler
handler)
{
struct acpi_table_header *table = NULL;
+ if (acpi_disabled)
+ return -ENODEV;
+
if (!handler)
return -EINVAL;
--
2.0.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
