diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-02-27 21:59:03 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-02-27 21:59:03 +0200 |
| commit | 51bcc7386a01074452c585e421a24dfc7b19063b (patch) | |
| tree | f9c7633d6d4349c0e21b23090b857a0fcd790418 /drivers/acpi/acpica/dsdebug.c | |
| parent | c89e333d5e4a27f736c960b29040b261c21563a5 (diff) | |
| parent | 50ee738d7271fe825e4024cdfa5c5301a871e2c2 (diff) | |
Merge tag 'mac80211-next-for-davem-2016-02-26' into next2
Here's another round of updates for -next:
* big A-MSDU RX performance improvement (avoid linearize of paged RX)
* rfkill changes: cleanups, documentation, platform properties
* basic PBSS support in cfg80211
* MU-MIMO action frame processing support
* BlockAck reordering & duplicate detection offload support
* various cleanups & little fixes
Diffstat (limited to 'drivers/acpi/acpica/dsdebug.c')
| -rw-r--r-- | drivers/acpi/acpica/dsdebug.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/dsdebug.c b/drivers/acpi/acpica/dsdebug.c index 309556efc553..1eb82bd7ee16 100644 --- a/drivers/acpi/acpica/dsdebug.c +++ b/drivers/acpi/acpica/dsdebug.c @@ -161,6 +161,7 @@ acpi_ds_dump_method_stack(acpi_status status, ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, "\n**** Exception %s during execution of method ", acpi_format_exception(status))); + acpi_ds_print_node_pathname(walk_state->method_node, NULL); /* Display stack of executing methods */ @@ -203,8 +204,8 @@ acpi_ds_dump_method_stack(acpi_status status, } else { /* * This method has called another method - * NOTE: the method call parse subtree is already deleted at this - * point, so we cannot disassemble the method invocation. + * NOTE: the method call parse subtree is already deleted at + * this point, so we cannot disassemble the method invocation. */ ACPI_DEBUG_PRINT_RAW((ACPI_DB_DISPATCH, "Call to method ")); |