aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-07-16 04:57:52 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-19 19:34:57 -0400
commita8278efd84f7643d5e44e5e507b657c231b0743b (patch)
tree615f264649636ec21307c4efe870f5f3ca2ff4ab
parent1795cd9b3a91d4b5473c97f491d63892442212ab (diff)
ACPICA: Linux: Add stub support for Linux specific variables and functions.
There are global variables and functions not upstreamed to the ACPICA code base. Such symbols still can be referenced by external users as they are listed in the acpixf.h. This patch uses ACPI_GLOBAL and ACPI_EXTERNAL_RETURN_STATUS mechanism to add stub support for such symbols. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/bus.c3
-rw-r--r--include/acpi/acpixf.h28
2 files changed, 17 insertions, 14 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index c5bc8cfe09fa..8581f5b84f48 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -477,9 +477,6 @@ static int __init acpi_bus_init_irq(void)
477 return 0; 477 return 0;
478} 478}
479 479
480u8 acpi_gbl_permanent_mmap;
481
482
483void __init acpi_early_init(void) 480void __init acpi_early_init(void)
484{ 481{
485 acpi_status status; 482 acpi_status status;
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 35b525c19711..bdbb145b1381 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -53,8 +53,6 @@
53#include <acpi/actbl.h> 53#include <acpi/actbl.h>
54#include <acpi/acbuffer.h> 54#include <acpi/acbuffer.h>
55 55
56extern u8 acpi_gbl_permanent_mmap;
57
58/***************************************************************************** 56/*****************************************************************************
59 * 57 *
60 * Macros used for ACPICA globals and configuration 58 * Macros used for ACPICA globals and configuration
@@ -865,17 +863,25 @@ ACPI_DBG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(6)
865/* 863/*
866 * Divergences 864 * Divergences
867 */ 865 */
868acpi_status acpi_get_id(acpi_handle object, acpi_owner_id * out_type); 866ACPI_GLOBAL(u8, acpi_gbl_permanent_mmap);
867
868ACPI_EXTERNAL_RETURN_STATUS(acpi_status
869 acpi_get_id(acpi_handle object,
870 acpi_owner_id * out_type))
869 871
870acpi_status acpi_unload_table_id(acpi_owner_id id); 872ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_unload_table_id(acpi_owner_id id))
871 873
872acpi_status 874ACPI_EXTERNAL_RETURN_STATUS(acpi_status
873acpi_get_table_with_size(acpi_string signature, 875 acpi_get_table_with_size(acpi_string signature,
874 u32 instance, struct acpi_table_header **out_table, 876 u32 instance,
875 acpi_size *tbl_size); 877 struct acpi_table_header
878 **out_table,
879 acpi_size *tbl_size))
876 880
877acpi_status 881ACPI_EXTERNAL_RETURN_STATUS(acpi_status
878acpi_get_data_full(acpi_handle object, acpi_object_handler handler, void **data, 882 acpi_get_data_full(acpi_handle object,
879 void (*callback)(void *)); 883 acpi_object_handler handler,
884 void **data,
885 void (*callback)(void *)))
880 886
881#endif /* __ACXFACE_H__ */ 887#endif /* __ACXFACE_H__ */