[RESEND] [PATCH 4/6] ACPI: make inactive table management configurable

[Zhang Rui <rui.zhang@xxxxxxxxx>]

Introduce flag ACPI_INACTIVE_TABLE_MANAGEMENT,
which is used to disable/enable the inactive
table management.

Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
---
 drivers/acpi/tables/tbutils.c |    3 ++-
 drivers/acpi/tables/tbxface.c |   18 +++++++++++++++++-
 include/acpi/acconfig.h       |    4 ++++
 include/acpi/acglobal.h       |    2 ++
 4 files changed, 25 insertions(+), 2 deletions(-)

Index: linux-acpi-2.6/drivers/acpi/tables/tbutils.c
===================================================================
--- linux-acpi-2.6.orig/drivers/acpi/tables/tbutils.c
+++ linux-acpi-2.6/drivers/acpi/tables/tbutils.c
@@ -452,11 +452,12 @@ acpi_tb_parse_root_table(acpi_physical_a
 					"using RSDT"));
 		}
 	}
+#ifdef ACPI_INACTIVE_TABLE_MANAGEMENT
 	acpi_inactive_tables_root_pointer =
 		(address == rsdt_address ? xsdt_address : rsdt_address);
 	acpi_inactive_tables_entry_size =
 		(table_entry_size == sizeof(u32) ? sizeof(u64) : sizeof(u32));
-
+#endif
 	/* Map the RSDT/XSDT table header to get the full table length */
 
 	table = acpi_os_map_memory(address, sizeof(struct acpi_table_header));
Index: linux-acpi-2.6/drivers/acpi/tables/tbxface.c
===================================================================
--- linux-acpi-2.6.orig/drivers/acpi/tables/tbxface.c
+++ linux-acpi-2.6/drivers/acpi/tables/tbxface.c
@@ -165,6 +165,7 @@ acpi_initialize_tables(struct acpi_table
  * 		and install them to the global inactive table list.
  *
  ******************************************************************************/
+#ifdef ACPI_INACTIVE_TABLE_MANAGEMENT
 acpi_status __init
 acpi_initialize_inactive_tables(void)
 {
@@ -284,6 +285,13 @@ acpi_initialize_inactive_tables(void)
 
 	return_ACPI_STATUS(status);
 }
+#else
+acpi_status __init
+acpi_initialize_inactive_tables(void)
+{
+	return AE_OK;
+}
+#endif
 /*******************************************************************************
  *
  * FUNCTION:    acpi_reallocate_root_table
@@ -617,6 +625,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_ind
  * DESCRIPTION: Obtain a table by an index into the global inactive table list.
  *
  ******************************************************************************/
+#ifdef ACPI_INACTIVE_TABLE_MANAGEMENT
 acpi_status
 acpi_get_inactive_table_by_index(u32 table_index,
 				 struct acpi_table_header **table)
@@ -652,7 +661,14 @@ acpi_get_inactive_table_by_index(u32 tab
 	*table = acpi_gbl_inactive_root_table_list.tables[table_index].pointer;
 	return_ACPI_STATUS(AE_OK);
 }
-
+#else
+acpi_status
+acpi_get_inactive_table_by_index(u32 table_index,
+					struct acpi_table_header **table)
+{
+	return AE_NOT_FOUND;
+}
+#endif
 /*******************************************************************************
  *
  * FUNCTION:    acpi_tb_load_namespace
Index: linux-acpi-2.6/include/acpi/acconfig.h
===================================================================
--- linux-acpi-2.6.orig/include/acpi/acconfig.h
+++ linux-acpi-2.6/include/acpi/acconfig.h
@@ -119,6 +119,10 @@
 
 #define ACPI_ROOT_TABLE_SIZE_INCREMENT  4
 
+/* Support ACPI inactive table management */
+
+#define ACPI_INACTIVE_TABLE_MANAGEMENT
+
 /******************************************************************************
  *
  * ACPI Specification constants (Do not change unless the specification changes)
Index: linux-acpi-2.6/include/acpi/acglobal.h
===================================================================
--- linux-acpi-2.6.orig/include/acpi/acglobal.h
+++ linux-acpi-2.6/include/acpi/acglobal.h
@@ -139,9 +139,11 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags;
  * acpi_gbl_FADT is a local copy of the FADT, converted to a common format.
  */
 ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
+#ifdef ACPI_INACTIVE_TABLE_MANAGEMENT
 ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_inactive_root_table_list;
 ACPI_EXTERN acpi_physical_address acpi_inactive_tables_root_pointer;
 ACPI_EXTERN u32 acpi_inactive_tables_entry_size;
+#endif
 ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
 extern u8 acpi_gbl_permanent_mmap;
 


--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html