diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 03:26:26 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 03:26:26 +0100 |
| commit | b17629dbf72d0718e88190d7f0a1d54be044799c (patch) | |
| tree | 90e1908b4c7eab87989b17341cdaa8d074e355b2 /drivers/acpi/acpica/acdebug.h | |
| parent | 74bf8efb5fa6e958d2d7c7917b8bb672085ec0c6 (diff) | |
| parent | 59adb3988ebeec012343317ac783d6a7935e0c83 (diff) | |
| download | kernel_replicant_linux-b17629dbf72d0718e88190d7f0a1d54be044799c.tar.gz kernel_replicant_linux-b17629dbf72d0718e88190d7f0a1d54be044799c.tar.bz2 kernel_replicant_linux-b17629dbf72d0718e88190d7f0a1d54be044799c.zip | |
Merge branch 'acpi-debug' into acpica
Diffstat (limited to 'drivers/acpi/acpica/acdebug.h')
| -rw-r--r-- | drivers/acpi/acpica/acdebug.h | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h index c928ba494c40..dcaa15d5fe27 100644 --- a/drivers/acpi/acpica/acdebug.h +++ b/drivers/acpi/acpica/acdebug.h @@ -80,9 +80,15 @@ struct acpi_db_execute_walk { /* * dbxface - external debugger interfaces */ -acpi_status -acpi_db_single_step(struct acpi_walk_state *walk_state, - union acpi_parse_object *op, u32 op_type); +ACPI_DBR_DEPENDENT_RETURN_OK(acpi_status + acpi_db_single_step(struct acpi_walk_state + *walk_state, + union acpi_parse_object *op, + u32 op_type)) + ACPI_DBR_DEPENDENT_RETURN_VOID(void + acpi_db_signal_break_point(struct + acpi_walk_state + *walk_state)) /* * dbcmds - debug commands and output routines @@ -182,11 +188,15 @@ void acpi_db_display_method_info(union acpi_parse_object *op); void acpi_db_decode_and_display_object(char *target, char *output_type); -void -acpi_db_display_result_object(union acpi_operand_object *obj_desc, - struct acpi_walk_state *walk_state); +ACPI_DBR_DEPENDENT_RETURN_VOID(void + acpi_db_display_result_object(union + acpi_operand_object + *obj_desc, + struct + acpi_walk_state + *walk_state)) -acpi_status acpi_db_display_all_methods(char *display_count_arg); + acpi_status acpi_db_display_all_methods(char *display_count_arg); void acpi_db_display_arguments(void); @@ -198,9 +208,13 @@ void acpi_db_display_calling_tree(void); void acpi_db_display_object_type(char *object_arg); -void -acpi_db_display_argument_object(union acpi_operand_object *obj_desc, - struct acpi_walk_state *walk_state); +ACPI_DBR_DEPENDENT_RETURN_VOID(void + acpi_db_display_argument_object(union + acpi_operand_object + *obj_desc, + struct + acpi_walk_state + *walk_state)) /* * dbexec - debugger control method execution @@ -257,7 +271,7 @@ acpi_db_command_dispatch(char *input_buffer, void ACPI_SYSTEM_XFACE acpi_db_execute_thread(void *context); -acpi_status acpi_db_user_commands(char prompt, union acpi_parse_object *op); +acpi_status acpi_db_user_commands(void); char *acpi_db_get_next_token(char *string, char **next, acpi_object_type * return_type); |