aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2014-01-23 19:49:51 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-27 17:59:08 -0500
commit481c13814a4ecc8305fb7c871067a73cafd09d07 (patch)
tree9f5fe176f0201a7490f1bcbdb6e718e7a6b45183
parentc14ced0464bf5ef3a3fad6d69bbf07c80bfbaf5b (diff)
ACPICA: Remove bool usage from ACPICA.
The use of "bool" is not safe for ACPICA code where it is originally using a "BOOLEAN" defined as "unsigned char". This patch removes the only "bool" usage from kernel source tree to reduce the source code differences between Linux and ACPICA upstream. This patch is required by future acpidump release automation. 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/acpica/acglobal.h2
-rw-r--r--drivers/acpi/sysfs.c2
-rw-r--r--include/acpi/acpixf.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 24db8e153bf0..4ed1aa384df2 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -108,7 +108,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);
108/* 108/*
109 * Optionally enable output from the AML Debug Object. 109 * Optionally enable output from the AML Debug Object.
110 */ 110 */
111bool ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE); 111u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);
112 112
113/* 113/*
114 * Optionally copy the entire DSDT to local memory (instead of simply 114 * Optionally copy the entire DSDT to local memory (instead of simply
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 6dbc3ca45223..3e0b54fb075b 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -226,7 +226,7 @@ module_param_call(trace_state, param_set_trace_state, param_get_trace_state,
226/* /sys/modules/acpi/parameters/aml_debug_output */ 226/* /sys/modules/acpi/parameters/aml_debug_output */
227 227
228module_param_named(aml_debug_output, acpi_gbl_enable_aml_debug_object, 228module_param_named(aml_debug_output, acpi_gbl_enable_aml_debug_object,
229 bool, 0644); 229 byte, 0644);
230MODULE_PARM_DESC(aml_debug_output, 230MODULE_PARM_DESC(aml_debug_output,
231 "To enable/disable the ACPI Debug Object output."); 231 "To enable/disable the ACPI Debug Object output.");
232 232
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index d2f16f14b419..fea6773f87fc 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -77,7 +77,7 @@ extern u8 acpi_gbl_create_osi_method;
77extern u8 acpi_gbl_disable_auto_repair; 77extern u8 acpi_gbl_disable_auto_repair;
78extern u8 acpi_gbl_disable_ssdt_table_load; 78extern u8 acpi_gbl_disable_ssdt_table_load;
79extern u8 acpi_gbl_do_not_use_xsdt; 79extern u8 acpi_gbl_do_not_use_xsdt;
80extern bool acpi_gbl_enable_aml_debug_object; 80extern u8 acpi_gbl_enable_aml_debug_object;
81extern u8 acpi_gbl_enable_interpreter_slack; 81extern u8 acpi_gbl_enable_interpreter_slack;
82extern u32 acpi_gbl_trace_flags; 82extern u32 acpi_gbl_trace_flags;
83extern acpi_name acpi_gbl_trace_method_name; 83extern acpi_name acpi_gbl_trace_method_name;