瀏覽代碼

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>
Lv Zheng 11 年之前
父節點
當前提交
a8278efd84
共有 2 個文件被更改,包括 17 次插入14 次删除
  1. 0 3
      drivers/acpi/bus.c
  2. 17 11
      include/acpi/acpixf.h

+ 0 - 3
drivers/acpi/bus.c

@@ -477,9 +477,6 @@ static int __init acpi_bus_init_irq(void)
 	return 0;
 	return 0;
 }
 }
 
 
-u8 acpi_gbl_permanent_mmap;
-
-
 void __init acpi_early_init(void)
 void __init acpi_early_init(void)
 {
 {
 	acpi_status status;
 	acpi_status status;

+ 17 - 11
include/acpi/acpixf.h

@@ -53,8 +53,6 @@
 #include <acpi/actbl.h>
 #include <acpi/actbl.h>
 #include <acpi/acbuffer.h>
 #include <acpi/acbuffer.h>
 
 
-extern u8 acpi_gbl_permanent_mmap;
-
 /*****************************************************************************
 /*****************************************************************************
  *
  *
  * Macros used for ACPICA globals and configuration
  * Macros used for ACPICA globals and configuration
@@ -865,17 +863,25 @@ ACPI_DBG_DEPENDENT_RETURN_VOID(ACPI_PRINTF_LIKE(6)
 /*
 /*
  * Divergences
  * Divergences
  */
  */
-acpi_status acpi_get_id(acpi_handle object, acpi_owner_id * out_type);
+ACPI_GLOBAL(u8, acpi_gbl_permanent_mmap);
+
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+			    acpi_get_id(acpi_handle object,
+					acpi_owner_id * out_type))
 
 
-acpi_status acpi_unload_table_id(acpi_owner_id id);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_unload_table_id(acpi_owner_id id))
 
 
-acpi_status
-acpi_get_table_with_size(acpi_string signature,
-	       u32 instance, struct acpi_table_header **out_table,
-	       acpi_size *tbl_size);
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+			    acpi_get_table_with_size(acpi_string signature,
+						     u32 instance,
+						     struct acpi_table_header
+						     **out_table,
+						     acpi_size *tbl_size))
 
 
-acpi_status
-acpi_get_data_full(acpi_handle object, acpi_object_handler handler, void **data,
-		   void (*callback)(void *));
+ACPI_EXTERNAL_RETURN_STATUS(acpi_status
+			    acpi_get_data_full(acpi_handle object,
+					       acpi_object_handler handler,
+					       void **data,
+					       void (*callback)(void *)))
 
 
 #endif				/* __ACXFACE_H__ */
 #endif				/* __ACXFACE_H__ */