diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
| commit | 7731b8bc94e599c9a79e428f3359ff2c34b7576a (patch) | |
| tree | 879f18ccbe274122f2d4f095b43cbc7f953e0ada /drivers/acpi/acpica/dsdebug.c | |
| parent | 48e315618dc4dc8904182cd221e3d395d5d97005 (diff) | |
| parent | 9ffc59d57228d74809700be6f7ecb1db10292f05 (diff) | |
Merge branch 'linus' into x86/urgent
Required to queue a dependent fix.
Diffstat (limited to 'drivers/acpi/acpica/dsdebug.c')
| -rw-r--r-- | drivers/acpi/acpica/dsdebug.c | 12 | 
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/dsdebug.c b/drivers/acpi/acpica/dsdebug.c index 70a2fca60306..9d33f0bb2885 100644 --- a/drivers/acpi/acpica/dsdebug.c +++ b/drivers/acpi/acpica/dsdebug.c @@ -162,9 +162,15 @@ acpi_ds_dump_method_stack(acpi_status status,  				op->common.next = NULL;  #ifdef ACPI_DISASSEMBLER -				acpi_os_printf("Failed at "); -				acpi_dm_disassemble(next_walk_state, op, -						    ACPI_UINT32_MAX); +				if (walk_state->method_node != +				    acpi_gbl_root_node) { + +					/* More verbose if not module-level code */ + +					acpi_os_printf("Failed at "); +					acpi_dm_disassemble(next_walk_state, op, +							    ACPI_UINT32_MAX); +				}  #endif  				op->common.next = next;  			}  | 
