diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-11-16 11:31:17 +0100 |
commit | f108c898ddae4bb1146ed9e46ce4470725d945c4 (patch) | |
tree | bb887907e0448d4d903f853c33b3c55a863412e2 /tools | |
parent | 904cb3677f3adcd3d837be0a0d0b14251ba8d6f7 (diff) | |
parent | 68055915c1c22489f9658bd2b7391bb11b2cf4e4 (diff) | |
download | linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.tar.gz linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.tar.bz2 linux-f108c898ddae4bb1146ed9e46ce4470725d945c4.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/power/acpi/os_specific/service_layers/osunixxf.c | 8 | ||||
-rw-r--r-- | tools/power/acpi/tools/acpidump/apdump.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/power/acpi/os_specific/service_layers/osunixxf.c b/tools/power/acpi/os_specific/service_layers/osunixxf.c index 60b58cd18410..7ccb073f8316 100644 --- a/tools/power/acpi/os_specific/service_layers/osunixxf.c +++ b/tools/power/acpi/os_specific/service_layers/osunixxf.c @@ -122,6 +122,14 @@ static void os_enter_line_edit_mode(void) { struct termios local_term_attributes; + term_attributes_were_set = 0; + + /* STDIN must be a terminal */ + + if (!isatty(STDIN_FILENO)) { + return; + } + /* Get and keep the original attributes */ if (tcgetattr(STDIN_FILENO, &original_term_attributes)) { diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c index 53cee781e24e..24d32968802d 100644 --- a/tools/power/acpi/tools/acpidump/apdump.c +++ b/tools/power/acpi/tools/acpidump/apdump.c @@ -146,7 +146,7 @@ u32 ap_get_table_length(struct acpi_table_header *table) if (ACPI_VALIDATE_RSDP_SIG(table->signature)) { rsdp = ACPI_CAST_PTR(struct acpi_table_rsdp, table); - return (rsdp->length); + return (acpi_tb_get_rsdp_length(rsdp)); } /* Normal ACPI table */ |