aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-02-07 20:42:46 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-10 18:30:25 -0500
commit3334861b1e9947631230b573eba27bcd778b93c8 (patch)
tree6f8e2f293f28a38b986c9638777c19fed003654d
parenteb60c4d3a43c8ba9a55e6b2ac824472de50aed11 (diff)
ACPICA: Update the conditions to enable the utility resource dump strings.
This patch enables resource dump functions for debugging purpose where ACPI_DEBUG_OUTPUT is enabled. Such functions are useful for developers to track kernel issues when composing debugging patches. They will be optimized out during link stage for normal builds. This patch updates the compilation condition used for the resource dump related string tables to match the compilation environment used for rsdump.c and rsdumpinfo.c. This patch can help to improve the ACPICA release automation. Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/Makefile4
-rw-r--r--drivers/acpi/acpica/acutils.h2
-rw-r--r--drivers/acpi/acpica/rsdump.c3
-rw-r--r--drivers/acpi/acpica/rsdumpinfo.c2
-rw-r--r--drivers/acpi/acpica/rsinfo.c4
-rw-r--r--drivers/acpi/acpica/utresrc.c3
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index 438304086ff1..b7ed86a20427 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -122,6 +122,8 @@ acpi-y += \
122 rsaddr.o \ 122 rsaddr.o \
123 rscalc.o \ 123 rscalc.o \
124 rscreate.o \ 124 rscreate.o \
125 rsdump.o \
126 rsdumpinfo.o \
125 rsinfo.o \ 127 rsinfo.o \
126 rsio.o \ 128 rsio.o \
127 rsirq.o \ 129 rsirq.o \
@@ -132,8 +134,6 @@ acpi-y += \
132 rsutils.o \ 134 rsutils.o \
133 rsxface.o 135 rsxface.o
134 136
135acpi-$(ACPI_FUTURE_USAGE) += rsdump.o rsdumpinfo.o
136
137acpi-y += \ 137acpi-y += \
138 tbfadt.o \ 138 tbfadt.o \
139 tbfind.o \ 139 tbfind.o \
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 24735eb0459f..ceeec0b7ccb1 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -49,7 +49,7 @@ extern const u8 acpi_gbl_resource_aml_serial_bus_sizes[];
49 49
50/* Strings used by the disassembler and debugger resource dump routines */ 50/* Strings used by the disassembler and debugger resource dump routines */
51 51
52#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER) 52#if defined(ACPI_DEBUG_OUTPUT) || defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
53 53
54extern const char *acpi_gbl_bm_decode[]; 54extern const char *acpi_gbl_bm_decode[];
55extern const char *acpi_gbl_config_decode[]; 55extern const char *acpi_gbl_config_decode[];
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 7e840086afc7..524c5a5300b8 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -47,7 +47,8 @@
47 47
48#define _COMPONENT ACPI_RESOURCES 48#define _COMPONENT ACPI_RESOURCES
49ACPI_MODULE_NAME("rsdump") 49ACPI_MODULE_NAME("rsdump")
50#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) 50
51#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBER) || defined(ACPI_DEBUGGER)
51/* Local prototypes */ 52/* Local prototypes */
52static void acpi_rs_out_string(char *title, char *value); 53static void acpi_rs_out_string(char *title, char *value);
53 54
diff --git a/drivers/acpi/acpica/rsdumpinfo.c b/drivers/acpi/acpica/rsdumpinfo.c
index 60a852e800f6..2f9332d5c973 100644
--- a/drivers/acpi/acpica/rsdumpinfo.c
+++ b/drivers/acpi/acpica/rsdumpinfo.c
@@ -48,7 +48,7 @@
48#define _COMPONENT ACPI_RESOURCES 48#define _COMPONENT ACPI_RESOURCES
49ACPI_MODULE_NAME("rsdumpinfo") 49ACPI_MODULE_NAME("rsdumpinfo")
50 50
51#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) 51#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)
52#define ACPI_RSD_OFFSET(f) (u8) ACPI_OFFSET (union acpi_resource_data,f) 52#define ACPI_RSD_OFFSET(f) (u8) ACPI_OFFSET (union acpi_resource_data,f)
53#define ACPI_PRT_OFFSET(f) (u8) ACPI_OFFSET (struct acpi_pci_routing_table,f) 53#define ACPI_PRT_OFFSET(f) (u8) ACPI_OFFSET (struct acpi_pci_routing_table,f)
54#define ACPI_RSD_TABLE_SIZE(name) (sizeof(name) / sizeof (struct acpi_rsdump_info)) 54#define ACPI_RSD_TABLE_SIZE(name) (sizeof(name) / sizeof (struct acpi_rsdump_info))
diff --git a/drivers/acpi/acpica/rsinfo.c b/drivers/acpi/acpica/rsinfo.c
index d984d45dfbaf..9d3f8a9a24bd 100644
--- a/drivers/acpi/acpica/rsinfo.c
+++ b/drivers/acpi/acpica/rsinfo.c
@@ -132,8 +132,7 @@ struct acpi_rsconvert_info *acpi_gbl_convert_resource_serial_bus_dispatch[] = {
132 acpi_rs_convert_uart_serial_bus, 132 acpi_rs_convert_uart_serial_bus,
133}; 133};
134 134
135#ifdef ACPI_FUTURE_USAGE 135#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUGGER)
136#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
137 136
138/* Dispatch table for resource dump functions */ 137/* Dispatch table for resource dump functions */
139 138
@@ -168,7 +167,6 @@ struct acpi_rsdump_info *acpi_gbl_dump_serial_bus_dispatch[] = {
168}; 167};
169#endif 168#endif
170 169
171#endif /* ACPI_FUTURE_USAGE */
172/* 170/*
173 * Base sizes for external AML resource descriptors, indexed by internal type. 171 * Base sizes for external AML resource descriptors, indexed by internal type.
174 * Includes size of the descriptor header (1 byte for small descriptors, 172 * Includes size of the descriptor header (1 byte for small descriptors,
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index e71a4d808874..14cb6c0c8be2 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -47,7 +47,8 @@
47 47
48#define _COMPONENT ACPI_UTILITIES 48#define _COMPONENT ACPI_UTILITIES
49ACPI_MODULE_NAME("utresrc") 49ACPI_MODULE_NAME("utresrc")
50#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER) 50
51#if defined(ACPI_DEBUG_OUTPUT) || defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
51/* 52/*
52 * Strings used to decode resource descriptors. 53 * Strings used to decode resource descriptors.
53 * Used by both the disassembler and the debugger resource dump routines 54 * Used by both the disassembler and the debugger resource dump routines