summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Arcari <darcari@redhat.com>2019-02-12 09:34:39 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-20 09:15:01 +0200
commit182d26496e045247939c8697c6448a4830f0dff6 (patch)
tree914ebf69f5c1485d11f8b56d143c1966fdbbec05 /tools
parent3fb2d0a276294a7625216395bc329e917e0643e2 (diff)
downloadlinux-stable-182d26496e045247939c8697c6448a4830f0dff6.tar.gz
linux-stable-182d26496e045247939c8697c6448a4830f0dff6.tar.bz2
linux-stable-182d26496e045247939c8697c6448a4830f0dff6.zip
tools/power turbostat: return the exit status of a command
[ Upstream commit 2a95496634a017c19641f26f00907af75b962f01 ] turbostat failed to return a non-zero exit status even though the supplied command (turbostat <command>) failed. Currently when turbostat forks a command it returns zero instead of the actual exit status of the command. Modify the code to return the exit status. Signed-off-by: David Arcari <darcari@redhat.com> Acked-by: Len Brown <len.brown@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/power/x86/turbostat/turbostat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 7a1b20ec5216..d1b2348db0f9 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -4588,6 +4588,9 @@ int fork_it(char **argv)
signal(SIGQUIT, SIG_IGN);
if (waitpid(child_pid, &status, 0) == -1)
err(status, "waitpid");
+
+ if (WIFEXITED(status))
+ status = WEXITSTATUS(status);
}
/*
* n.b. fork_it() does not check for errors from for_all_cpus()