diff options
author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2018-10-16 11:56:26 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-01 09:42:50 +0100 |
commit | 3b99dcd4026a08fc9d1fd5cc0a9fc50529803fca (patch) | |
tree | 31f189c5c0e69842617a2d1886830355f6dc070a /tools/power/cpupower/lib/cpupower.c | |
parent | a0b9ddf4906e6340c4ce920c9450de05021e73ac (diff) | |
download | linux-stable-3b99dcd4026a08fc9d1fd5cc0a9fc50529803fca.tar.gz linux-stable-3b99dcd4026a08fc9d1fd5cc0a9fc50529803fca.tar.bz2 linux-stable-3b99dcd4026a08fc9d1fd5cc0a9fc50529803fca.zip |
tools/power/cpupower: fix compilation with STATIC=true
commit 9de9aa45e9bd67232e000cca42ceb134b8ae51b6 upstream.
Rename duplicate sysfs_read_file into cpupower_read_sysfs and fix linking.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Thomas Renninger <trenn@suse.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/power/cpupower/lib/cpupower.c')
-rw-r--r-- | tools/power/cpupower/lib/cpupower.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/power/cpupower/lib/cpupower.c b/tools/power/cpupower/lib/cpupower.c index 9c395ec924de..9711d628b0f4 100644 --- a/tools/power/cpupower/lib/cpupower.c +++ b/tools/power/cpupower/lib/cpupower.c @@ -15,7 +15,7 @@ #include "cpupower.h" #include "cpupower_intern.h" -unsigned int sysfs_read_file(const char *path, char *buf, size_t buflen) +unsigned int cpupower_read_sysfs(const char *path, char *buf, size_t buflen) { int fd; ssize_t numread; @@ -95,7 +95,7 @@ static int sysfs_topology_read_file(unsigned int cpu, const char *fname, int *re snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/topology/%s", cpu, fname); - if (sysfs_read_file(path, linebuf, MAX_LINE_LEN) == 0) + if (cpupower_read_sysfs(path, linebuf, MAX_LINE_LEN) == 0) return -1; *result = strtol(linebuf, &endp, 0); if (endp == linebuf || errno == ERANGE) |