Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2534773imu; Thu, 29 Nov 2018 06:32:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/XkhQOSeGeDQmL3N5ywsVdtu7J2KrO4N3IGscfUFMlnh/UEusk5csNIjsnOJ9wFwAOf6Fye X-Received: by 2002:a62:ce0e:: with SMTP id y14mr1691221pfg.100.1543501930493; Thu, 29 Nov 2018 06:32:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543501930; cv=none; d=google.com; s=arc-20160816; b=U+2JeuTKpsvUjnbxZbAUmn2PDy/cUHZfHBmJdPBqaB+9FpNTwK8GW3pM5XUT+ESaRv w0uvuOdNFuCTJFbvyXaIaCqE0ejWf2tjGAi/Ld8z1b2riqHRj+j9kDugHfc88hTQ+NA2 w278cGJcnrV7ZdGeAFdJUJfJLaRWDu7lbSPVCfA55qWhaNH+gzMcIG7GyDYrs5ssmFSk GV32kh/0kmrABG4CjIrzR8ploMWOIQwOTHoeBN7NgSE/28A5ZSdIx3I20txgJ9WcOkq/ AFqEjectr/hNHsnSHMpPaZDztfilggYK7yno7Uq2oB8qYjwBDuRx1K5qgNmXxubTBopf b5VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ETxt0aoilV2voUWUIdkOMWEZ7Q1Sq/PcJZf1U4AZPNo=; b=WliyiQKeZmHCNxFHvFyb3Y7q3AT4umSUCKzIYaA6DBKaLrGtKGF5jZ6ILeYcdqKO9/ 4tTTJhlfInJdwe4bPvH3QogbIbE5sJZWpsuYm56LCdYdfWhBIbrn1K6IcuGC5MTLQs4O AY3qEc7ZYW0mu4VmNuSBbbfEJXGdP4eirObCjQwoeU9wvej/RMQr6eRI5aAeFkPmJz1E jb2VE46JGVRGWA+9syTJ8B4+2e2yYIsSimeJNqKUepXyv4hI+nK/ehMPvJicEYJYNRGF UQAFhmK8fLPoZLuNPlI7vHG2Jh2GPGkz9bUWJ9Utsjp7gWTnl/+519bJ/r3XEp5Eua2B Oruw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bxtrC03L; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f124si2416763pfa.1.2018.11.29.06.31.38; Thu, 29 Nov 2018 06:32:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bxtrC03L; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388395AbeK3Bev (ORCPT + 99 others); Thu, 29 Nov 2018 20:34:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:36316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387401AbeK3Beu (ORCPT ); Thu, 29 Nov 2018 20:34:50 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61A3E2147D; Thu, 29 Nov 2018 14:29:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543501757; bh=lSeiYluvhgjUNJ8b50wDcFC0OJky0YvINn+axV2Dk/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bxtrC03LeTXBs3qJXcCwl8n4bbHoyYiaeeEqG35g6TvqUNeBQ2vieOYx1hg5QCFVK UVcbYtPor9cP+DlvbcZZJvTdantpy7aZURWo7St7GCMyLIwBM3fzpFzZ2EA0pQpimW D2k5llrZZU7V+biQy/R7jJ1tRMIrFCnW3oMj59zg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Konstantin Khlebnikov , Thomas Renninger , "Shuah Khan (Samsung OSG)" Subject: [PATCH 4.19 029/110] tools/power/cpupower: fix compilation with STATIC=true Date: Thu, 29 Nov 2018 15:12:00 +0100 Message-Id: <20181129135922.439183161@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129135921.231283053@linuxfoundation.org> References: <20181129135921.231283053@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Konstantin Khlebnikov commit 9de9aa45e9bd67232e000cca42ceb134b8ae51b6 upstream. Rename duplicate sysfs_read_file into cpupower_read_sysfs and fix linking. Signed-off-by: Konstantin Khlebnikov Acked-by: Thomas Renninger Cc: Signed-off-by: Shuah Khan (Samsung OSG) Signed-off-by: Greg Kroah-Hartman --- tools/power/cpupower/bench/Makefile | 2 +- tools/power/cpupower/lib/cpufreq.c | 2 +- tools/power/cpupower/lib/cpuidle.c | 2 +- tools/power/cpupower/lib/cpupower.c | 4 ++-- tools/power/cpupower/lib/cpupower_intern.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) --- a/tools/power/cpupower/bench/Makefile +++ b/tools/power/cpupower/bench/Makefile @@ -9,7 +9,7 @@ endif ifeq ($(strip $(STATIC)),true) LIBS = -L../ -L$(OUTPUT) -lm OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o \ - $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/sysfs.o + $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/cpupower.o else LIBS = -L../ -L$(OUTPUT) -lm -lcpupower OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o --- a/tools/power/cpupower/lib/cpufreq.c +++ b/tools/power/cpupower/lib/cpufreq.c @@ -28,7 +28,7 @@ static unsigned int sysfs_cpufreq_read_f snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/cpufreq/%s", cpu, fname); - return sysfs_read_file(path, buf, buflen); + return cpupower_read_sysfs(path, buf, buflen); } /* helper function to write a new value to a /sys file */ --- a/tools/power/cpupower/lib/cpuidle.c +++ b/tools/power/cpupower/lib/cpuidle.c @@ -319,7 +319,7 @@ static unsigned int sysfs_cpuidle_read_f snprintf(path, sizeof(path), PATH_TO_CPU "cpuidle/%s", fname); - return sysfs_read_file(path, buf, buflen); + return cpupower_read_sysfs(path, buf, buflen); } --- 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(unsi 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) --- a/tools/power/cpupower/lib/cpupower_intern.h +++ b/tools/power/cpupower/lib/cpupower_intern.h @@ -3,4 +3,4 @@ #define MAX_LINE_LEN 4096 #define SYSFS_PATH_MAX 255 -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);